From a752703682b4ce2a5df2f3cce7749f9e58cee1b3 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 14 May 2024 14:20:03 -0700
Subject: [PATCH] Really stop downgrading C++.

---
 .../curl-ssl/app/src/main/cpp/CMakeLists.txt  |   1 -
 .../app/src/main/cpp/CMakeLists.txt           |   1 -
 ...ang_rt.ubsan_standalone-aarch64-android.so | Bin 917440 -> 917440 bytes
 .../src/main/cpp/CMakeLists.txt               |   7 -------
 .../src/main/cpp/CMakeLists.txt               |   6 ------
 teapots/common/ndk_helper/CMakeLists.txt      |  13 ++++++++++---
 .../src/main/cpp/CMakeLists.txt               |   6 ------
 7 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt b/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt
index f57927dd6..e46c8e49d 100644
--- a/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt
+++ b/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt
@@ -21,6 +21,5 @@ find_package(curl REQUIRED CONFIG)
 find_package(jsoncpp REQUIRED CONFIG)
 
 add_library(app SHARED app.cpp http.cpp logging.cpp)
-set_target_properties(app PROPERTIES CXX_STANDARD 17)
 target_compile_options(app PRIVATE -Wall -Werror)
 target_link_libraries(app ${LIBLOG} curl::curl jsoncpp::jsoncpp)
diff --git a/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt b/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt
index d87c84b34..7151d61d3 100644
--- a/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt
+++ b/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt
@@ -20,6 +20,5 @@ project(app VERSION 1.0.0 LANGUAGES CXX)
 find_package(jsoncpp REQUIRED CONFIG)
 
 add_library(app SHARED app.cpp logging.cpp)
-set_target_properties(app PROPERTIES CXX_STANDARD 17)
 target_compile_options(app PRIVATE -Wall -Werror)
 target_link_libraries(app jsoncpp::jsoncpp)
diff --git a/sanitizers/app/src/ubsan/jniLibs/arm64-v8a/libclang_rt.ubsan_standalone-aarch64-android.so b/sanitizers/app/src/ubsan/jniLibs/arm64-v8a/libclang_rt.ubsan_standalone-aarch64-android.so
index cb60e3b1e4c59cdf4daeb318e8b414364f31dce3..711be83c863a24d8c0d10b2938356b24529198b3 100644
GIT binary patch
delta 9253
zcmbta2UJwo)}DK2?mjbf2M`!QMnFVFM1u<0z(iuhj=eoKO6>YXiN8jSCHC0+F~$;&
zg&1S^9b<zh8cPyOEKg0M2`1{(D9@G{(D?6j&VZ9O_}0JH&sv;&y{GN+?QidMFz-dZ
zychL$%rZN-j!fJNp||U`I*`|}cgU&H)>)rDnYzk6bCp@cUxL5l-NILy_4PCS-W<_C
zD|1Ny$k^Jo6O$Swuzs`kcx?b%I9tySXftHQumM@gk!{*EjjUZSzE*q!tMsWJ&-yOa
zBU$FBx|R2tqt~sR*qfS6l}yKLn&i*@RP_|?!Z4GG6a<+}8hPGKv;l95c6J~;zD-Xh
z3j(=qyS~IsDq7i^U3ycWt-hjrInL6IB3`&lH*4BH{%E(p)=WMQ<V(4}(n5y#vswpr
zCt2s<%@68^Mm`T@c@4nH1|8B{kU1{C^N?;3@{T_{oU0cHX?C$@o%&+UKO#&f$J->x
z%1-C$v1EaZKh4vli0?JI?=F|zJ&?!d>mg>JIr5*|gfOI#xA{`<ppiWezV^7Dhf=Y=
zC-rb*1oKHJ^?_!h+4-%n^=X>($MQJd)Dul&F+D>QShe1iO**ZIzuwp?R(c}0s+TO@
zLxV*dkE1k_?JwHfVz#?=y)NFH$liQ@<+L8D3Ehj&=#{J`qO$0-`Uhwlw*9O=D)63|
zZN>@m=X-4LvBY!w3N#h_=A1ssT0?I5zCY{yt=?X{$u@qgkJgSc*Li)Sc9DH}Uf)U*
zf_d5nJyz3-*vN}|MUocG7G2a^k=~U5a8XYbBJhBJ>3*7ZkX&p~Ft2u5&jGhcyIkzb
zHNCmDl~gu6m{q;5HzxRX*mXU&{_H@ZQe1P<&Tl8$VIbPzilUt)7n~~%VMwpFlyE_q
ze05zfCS*o1KT)7>wU8WtKIWDlX4VS$k~{hxjg+^uNx$k#=~IVTD381D=@WI5XlE-Q
z>Q|gsgeObwQUmQ$$<Aj!($h5U`Q|f^bwXD7vva>8@*gb!9leSktB6lr{q^7VXw7E#
zLvJQgJ(LZ7s@HXSYB8vm*wA0LDChpC`eI?awnh4WvN)L8iuE&zLr^2=MbptFdLwf0
z4KX7{>bFjct6cw%w2FeqZEif%f7W~zWJ<uopFh_hYee&5k6!4Xpp?s2z_^57($b$u
z+o|`{b;J(pJq$%Jd7s==z4Im-IQ_Jfta~|VLc)F6>T(c5QheAy%0U&YP?jc<2kb^U
zSRuYn@P}&Rnd1*fg=t0vKsc&6HvpzMWsI0t^&t{*<<Z71{CHF#M4Pq4EG-y@hc8CK
z$YTOE5b>n1DG7&IOs#ZxV4MwxC)#87We6N1dMKY>9_ni()y{H5Ax-RMbwRjGcM7>l
zU2IF8h*4?k<i{Ghpg~M<sOWcyexw%BDukVn67O8%X+a=c<APvfIQc(Z5Ur&a*-*_}
zj;qKB6!&~pa4O$ym%dRxE0(lS%v@n;mNs_YEDWM`5tzd&fs6FEvze73R>;1y609YS
zeR#(xSd2=AvYVA*Bnfx&?$J<BBRlMDQ5EP&I)t)csz6inRw%C?11B}@1$$Bzvcd&w
z%)O|vpZPKIIry%!aWpC(?_|?rp$ZAEz&?wGLSheKtExesQ}KzXD%t*QWE@<VPPHUC
zideVm5aCoTqtsFDE*JlxI#f5iG9@mrp;a^==~HZS@V7BiW<1;_Q|;_PP52M$$v>|J
z?`nvmm;@NAJ!Fd#Alh{TrPat{v53$2?<tAT;`GQ0>`VeYAe-#$NFr2ss+=&br5LS(
zXR9yQk|0(SmaAR|Dr*HSy$-^%iw_%I2Rgb2OPJqA0BGjP6V=LnaplkecA*YrgvBFB
z^mjEfPOzr=NB4+cIHHda>sS{OB7!U6h;f>&B?c=bYo-|NvzVITx{{;U*Hv!&x-O&$
zciQR!^9#pSEnTek0Gyg;y~(%NgJ&4ud}{;frxCj!^Gku<wKEZbmKxR(ZO~N_))y$8
zrLwg_EdDFWIu&hUu2_oO%ed*=7{Dpe2NA$KHH6xl(-X8MRKixg4tpzlXA4iVxXp*Z
z0X+nG+3`lOQu~f&q(URA^6?FxlL|ScqH=J7OgM^TJX6gRp4kMRiY54vX7Dx<nx9UC
z^1=<b(;%GGt-xsu@Y7=I%P9P78W-+Uu~s5BZ`cy9k{C}6me7|NthVkPF5V}H@`i07
zTPC%AZQ)Z-?AcbWQZC+u_Coc>x5G$@3t?y4!8MW@%C@H?G*HA7=}?ojak4+s;Wnui
z!fv#Oc&pOCgOi1JKm|gBS^W+$#Pw>C_<;^^OKQHMGgPuAAcl#rW;@1CcZM)zasF#(
z7@)b7Aq|PIz8jTzPf@%zPByG74EGe@e0#I%cZbe{uCSOitH7ssgO<`=XS>62A^#ga
z6zB%`Ku$f$X7qs5o^(e%ZP(k6kLU^GwEEtB=LsNB)>9%ckerCwsbVjfLfm>3%4G1V
zOcl%JfYcCvpbu;`Be(a<fZin2&hj#lGSU2(GoYVypiCvI9WCES`|-AKLpMS;IN7EF
z5Jfgx*{K0AoeT-t++iSC$h=VAX($llb41dLYR~eF;V{80ih`dqas9nc{zoQUBBXT)
zKbHkRShb(|_VHjf2TH0f4V~}Nq(}LwiC`xc1UXuI1&E|#=}U5DrIafHn#&3&BQbZX
zz+LadERA#v;Txtvk>r(+ry(8&TUqWjU|9Ban-1x2u#67j+onS%LER%}!MJ9T$Q9<p
z=2xbL|69%W{VYh6@UAi&Dv@`5Sc};(kaVxWcFcy2!u{RmK&(4l&$1bFAdY~+cFlp0
z%0(dKSh{MkPQ&Lx$Y;IhVsusyVn^me?dr;}Dif)CLbZ3(L|{e8g4>OE9x)H%q!6v<
zgX_OU0h>4<f_*#-(0smbKKKzV3E8fNFqte4<w=X+Bh9MVdzKIT*J9`@>hPLNAVjON
z8Z!o@!&k_tkO^O+<MgT^7?gH_sQUQv1{LWRQ#=&$tflZ8K@MQ+mc!;qkF;ZID{JRV
zh%mv+;%HGlfDL9aROHYL4EmD=0X%sHP>tjSuqGeE1nUmm+1w9`*ohBeQIOaYy1-2=
zuE=NP`w(H1%WT9-_^0+2tMw6NX!&f(N3fHO3t-Jxp=T-?e8?*3q=hK5hNj3*=7CUv
zSsz*eCg}64VLV9<V(r&JKjF9CYv4_?$&dZE2JTwLc6t|D#Qwb&Ry&nz5)HAb<O;IH
zkFWd~X*%>(3{=b=>(SAIdbfW9p{-QC^BB$Ou6oE?S>gOoYw^W9`aL6ltqe>R@irR^
z*nlaukf&^bLbE6nYUF^cabvWWEu9`h^=t|BFe1&?iDn|=?eCEQtjshrGD)<rk{64L
zSvk1wGrltiezFLnSo%5E0=K!(HrPSjCQ!AlN?<tS+z#YYq>{oNSg<rQ_>Vhbk_^gz
zyP*yit8B$?_(6NX#_WMLNhv6yWg9|&@=bh6x6|wRUiu^JaXrZtD1nlQ^2-F?VlPy4
zd6YKhq&!8!4RL0A5TCObv5PxY<w!PoWO~7YMS7-FDXV#8zMHyn%N_>%$38fQa`Opa
zz*H^bn81`>v+t~ma<#FmgMqy!CVrZ1NA5U)B_JM<k`G`3BY^VOL8z&H!4@1u^iD8X
z@j;j?K7Viss`=(hr?!$#-Q!?+hagzXW&b(^W379n7w3htu7{CTk+HH5Ll`|NY5D|T
zeHh}+u01FUo}a`is+1!4p{965{pFv~Pz%gQBfjjyqQ{ialkzbEb@WUZ3RDU($3@v^
z2yV6ZGBv~?u$TrRxJ$xtJVIn>m}a`4ifg%lc33nMnP;#wM<F=$8?hs~1D^Xn!-2>7
zpGP4_bABP!QW_hHVk`=~|4S6sdEqa@4#!F9HfBEo&9v*h{Ryy=znr?xNYjmt6iY<g
zSk@`bqL|-Sor0kjtF65F+&_r>o`LfqE*oxKgdTxX#ZpU&GCH59UxJ>bsdtg3kgu?z
zSk^NUv&LeB_vN{wdQI`3VrTa*L%fLK@GJ0<XX;G83O!i$t1!gcTWXKx$f~Ol)=%-o
ztQ0X_E%-pmEd#I^jbFka-ypy>;+a9!+<DRnYb4WjlOz`+SNOBG7=Mh1eg`AW){?Bv
z7F>f^pXhR;uOw3*y@sKOnX>pAJR*oo{-2-Vg>VXca09xQS(fs@{S2WRiLAiK{DMVM
z6$N62#cB=2;^h;tHJ3lBqG&7H`SS8xu$AobW7}>)a787yqQ;{!Vn#WPV~v!c`^GJp
zgf~Kgtp8mo@bN%7InO%%3KxAmP6Ff`UgsVr0>8TmADU}M5QwGnS?l}oiFTJ2-p2|!
z$KW3p!Zs~1PIf9|&y?6HU_Bqel^}t5+RIc<<XV%sBT;<v5P71rjYU3!WD&Hz9zl4Q
zS8<|eLEsQ!M2f44R=G-5-=4Ykua`TgAHgEY|NWl8cfQAkOMRU6Fs;-kmwBt-U_H_9
z@_SF=JG{s$$4?aj!E2*HcDfiMNN*dvUktT{gq5B_xYZ(gp+O*T{tV9+LE>yeYM8fP
zRsQIXI*tfpbDu*ZRzP{rp?qa=5;otmiqvezlW=PRBGV>>p~dtg!b;kr_&J`(gB`r-
zpAfHUh3uUdFe>I_w5KJ(t)fRUQW|8V(fNhT>~ySCC9MreCK}lwFMd+&dzaB+ng|s_
z=(~~X?3#g6{x$Kaqqpv4D+&E~l<*Yk<-SZHwW5Tmh#?d;7sZyMZZy-9n(7L>V5ZSE
zJn63FoFcZ7bZ7qhhO*2GT*l<fqAheAsp4Q4EVM(!W7H6;I#Q54X`G{JbNpAN;~2^h
zVGhh7O>~<7f4qI*HGnqONXK$~B&DS}QlaB<x{zjS5KpqxL1xl3kgxWksd$VI;@5rY
z2BOaO=E3)sp!-nHH^Lb6r_)K>Fdh*=f7M94K<;o-Cfvt12GMciY#JF%Z{b<h8bYfP
zacD{mrJMa~;LV9<-+?;l{+j(5`*$dPOS{cly67mEXEIa)s;Du=&M&wqp42dZw-2K|
zNV=7M7Dguv=e-tAWnOO`PP>N*_vpPGqAb_@n&J?N7L(v=>6qMbx?X$CGa{(V93ntx
zxkYCt;^QW*`x=_`F2&1*C6(x2GN>GH6-5)xWJM60RE1WqDAKOQu2BVMI^<16K@81D
z64yIWB;9{jp%q9i2fJ2<HVRZ>=BdjQRtrZ9>7T^Vo8tLHRoWAQ%NxYfd0JJG#z_)U
zr(@4jbQ#i$#q<^4_(%=zRippkYuvOr`kIV%yv7Y>3#!wwvS~KAI^C~{l41O7H0r-q
z?ff+wPyAf$7LFr!Uv9+HffSE1S#{_#k^5|Q>5oW@>~3AW<|<&(^=M!BnJ2p(n_G|8
zBz?-W_OtN%{9HY{8z)Y$Pd{z?Dw<PPRoLh+kVHI)%-lXmh5l0nYX2~v)qswYy8e<(
zV+23>q|hna8MZKmo_OUAfhUoU31kx+(x}LMbO17i+%H?u6R}AS`AKH8a9@_!kcLq=
zy|Nn(X|<S1a#%}25O_cl?K$LAjm$vY;a?a~K#jC?@PyatC2E_1glqZP7lGv846TU#
zSf?2s<Ln^k^_NHFj5sl)vM<kVM(b+gnD%>fnn)JfSdBCqr5#}DX>^*<@nRaS7U{`2
z1LP_{%d}p?K0KlYttB!pYu}1i^Zn};E}Pkk79!t|ZA}A2y*j%MT_f&a<J!{jAay%i
z%CM=(1=!WAErvL*HnT0QOe(tA*0wavn&K-&PW5GH+tO5$?cf3JsLhO`hIOE^q^*lL
z??AsL+8G|&nGVI1hCiR)g=P`5$;SWaMxPN<!Jq%$lOE7WZGXO}7mYI`iSQraqD=`&
z_vJAew3$t8`uAb9aud%#Wq5+e6EJI~4L!1;xpPmY$w5@(6gxkR7Kjpx52sbNpV;-`
zG@J}`u|J2?i*CryD9^t8JFR9tBOSlV#vCK)7Si9B?;AlUYmx6tjen5Noh8s>Tl$vT
zAQsc!6kpbTB;6@QHbx;tDoRu>mqIC9srQExD5-L-t4&znQ8bv197Ta1l9>9IPZ)(9
z<ys{D+N2?FV;<dKZF3YK3w?Q;(e#2v>=QK(Esf7M<LE`aor}t*=iSHsFW9qe+K{yN
zXUXGf>mWb`n!B17p&cxyPY|_|Z&r?{OT_e=@5yCm_IQu-9`9Ly-}T@AY{%Qzw7u_~
z`9V_~{@VEmO^rrDWQfL3^)P&OvD(!>Msx8Y>MdgoxWozD^Jgjo)nsy+aKNqs#%ba;
z;B@H#wsNr12UlW6gAJ^GH6Ay_*rs_+SOldjJ{)R*#cRM2DT3TGAk(;S_8Rc(%K@%;
zjDg508lN)S7~w74empe0rMHhYW_S;H`f|XQamGaHrMQVw4L%#6W}(lW_oY6}HO08(
zCCpNEmD+;Yry85Y_+3-g_yYGcV4C`O<7q}8ulZvTH}3iSv0v!onr>Y4wp%?+K5ktC
zW*TF>%`y!k>K?Fuw(*AKlY+U*xpDK1iNa27%X}rv)%j)U@(2^3Tb5G`lrC8d)%f-9
z=eO=BS){%vs3*@@WYqPRxfT`xZjp8^Mo)QZpH(`5B`h^IdG+sq+5d2<LRZISa%Vne
znE~=pJ$tz^MwpE-BgWgqfJLTTr^X)|hrM=aUfR!HE759R19I^C%&kM#DpXQzwPiJ$
z(`#fqJSw<HHeOp6^f#9dVD@!VXf|bC8GeYyI@>LC)_Um&?)t>ICec~6SxwB!QO`U0
z^peCEkLK<LvOg`utbcpipS-0EqiiVc=K-G?UwW(hA=0T^)rVV+cHRRXy&TYUo8jwi
z);v7Yx>uO8!}!g6g}>ne#I3{PUB)G0_MyAWS}79$TI^nF@m}Lk@2w`h9I$1dG2c6K
z)<u@C(D5LWoCuVtTm`d^xn(W+q*CdOp+}5M-b;Rtr0o`}=a&MgD1OFqBf?wH@s&$P
zvXv*4o>?c6s{}U}eWk*;@z=<1;=``f>O;}#vZCo|m6D}+_E{s?=7oz)EUev9ZMjm`
z3g=!9i2JTAjMs=SUE#?0Wra(Rnk566>v|c`T2b21A6_pjNOt4t%I)|4KPeK*C@|)G
z=@L}Cbe#Q089_ApWq;9)GGZX_W&i%4%jkddvOoJ5MLk!4QKV<Tsh-L1=g^xf77K1F
z|LwnJtPvpMJ?|I;@qegj?8tpNf+rWc^VRzQAQr@sBM*$_l9_uxG7gImuE$2*zl)cS
z{Tw&tD#`sFYHZH|4wdbW40ON54R$mKF*s|41JgO~H02$~eeuj1?U1Z^XS72yKOZ_q
Rz0ABb*1_+L^|>_je*tV6VJ`px

delta 9263
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

diff --git a/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt b/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
index 4641e44d0..02f9185be 100644
--- a/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
+++ b/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
@@ -33,13 +33,6 @@ add_library(${PROJECT_NAME}
     TeapotRenderer.cpp
 )
 
-set_target_properties(${PROJECT_NAME}
-  PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
-)
-
 # Export ANativeActivity_onCreate(),
 # Refer to: https://github.com/android-ndk/ndk/issues/381.
 set_target_properties(${PROJECT_NAME}
diff --git a/teapots/classic-teapot/src/main/cpp/CMakeLists.txt b/teapots/classic-teapot/src/main/cpp/CMakeLists.txt
index 20279e1e3..10afb7dd9 100644
--- a/teapots/classic-teapot/src/main/cpp/CMakeLists.txt
+++ b/teapots/classic-teapot/src/main/cpp/CMakeLists.txt
@@ -32,12 +32,6 @@ add_library(${PROJECT_NAME}
     TeapotNativeActivity.cpp
     TeapotRenderer.cpp
 )
-set_target_properties(${PROJECT_NAME}
-  PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
-)
 
 # Export ANativeActivity_onCreate(),
 # Refer to: https://github.com/android-ndk/ndk/issues/381.
diff --git a/teapots/common/ndk_helper/CMakeLists.txt b/teapots/common/ndk_helper/CMakeLists.txt
index c020b9a7b..b596b798d 100644
--- a/teapots/common/ndk_helper/CMakeLists.txt
+++ b/teapots/common/ndk_helper/CMakeLists.txt
@@ -17,11 +17,14 @@ add_library(NdkHelper
     tapCamera.cpp
     vecmath.cpp
 )
+# TODO: Remove this
+# This does not do what it looks like it does. It looks like it's redundant with
+# the target_include_directories(... PUBLIC ...) below. What it's actually doing
+# is re-exporting the headers for every library linked below. This is how all
+# the teapots samples are getting their native_app_glue. They should depend on
+# it explicitly.
 set_target_properties(NdkHelper
   PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
     INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:NdkHelper,INCLUDE_DIRECTORIES>
 )
 target_include_directories(NdkHelper
@@ -29,6 +32,10 @@ target_include_directories(NdkHelper
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+# TODO: Audit, make private.
+# Some of these are here because it was a common location to link the
+# dependenices of the various teapot samples. Those samples should link their
+# dependencies explicitly.
 target_link_libraries(NdkHelper
   PUBLIC
     native_app_glue
diff --git a/teapots/textured-teapot/src/main/cpp/CMakeLists.txt b/teapots/textured-teapot/src/main/cpp/CMakeLists.txt
index 646785cda..6e10022eb 100644
--- a/teapots/textured-teapot/src/main/cpp/CMakeLists.txt
+++ b/teapots/textured-teapot/src/main/cpp/CMakeLists.txt
@@ -43,12 +43,6 @@ add_library(${PROJECT_NAME}
     Texture.cpp
     AssetUtil.cpp
 )
-set_target_properties(${PROJECT_NAME}
-  PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
-)
 target_include_directories(${PROJECT_NAME} PRIVATE ${commonDir})
 
 target_compile_options(${PROJECT_NAME} PRIVATE -Wno-unused-function)