summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Myles Watson <mylesgw@google.com> 2024-02-15 11:02:58 -0800
committer Myles Watson <mylesgw@google.com> 2024-02-15 19:53:12 +0000
commitdbd43e71acecb085e28e46433d5cf5f722b88d1f (patch)
tree8b6c7877cdb7d6b145d73b2de4aa81d571ffc9fe
parent1f90242d24fd6659af8052d20f0f0889ac82c7a5 (diff)
Use c++20 to allow format string checking
Bug: 305066880 Test: mma -j32 Flag: EXEMPT, build infrastructure change Change-Id: Ic60b8a4959e013fd2455a4c85659d4d0f7052b2e
-rw-r--r--Android.bp2
-rwxr-xr-xsystem/test/tool/mockcify.pl2
-rw-r--r--tools/rootcanal/Android.bp2
3 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index d585c6c9ca..2066ba6d4b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,5 +70,5 @@ cc_defaults {
"-Werror=reorder-init-list",
],
c_std: "c99",
- cpp_std: "c++17",
+ cpp_std: "c++20",
}
diff --git a/system/test/tool/mockcify.pl b/system/test/tool/mockcify.pl
index dd974c0aae..724f26d03c 100755
--- a/system/test/tool/mockcify.pl
+++ b/system/test/tool/mockcify.pl
@@ -264,7 +264,7 @@ sub compilation_screen {
my $link="test/mock/$hdr";
unlink "$INCDIR/$link";
symlink "$OUTDIR/$hdr", "$INCDIR/$link";
- system("$CC -c -std=c++17 -o /dev/null -D" . join(" -D", @defs) . " -I" . join(" -I", @incs) . " $OUTDIR/$src");
+ system("$CC -c -std=c++20 -o /dev/null -D" . join(" -D", @defs) . " -I" . join(" -I", @incs) . " $OUTDIR/$src");
my $rc = $?;
($? == 0)
? printf(STDERR "SUCCESS Compiled unit \'$src\'\n")
diff --git a/tools/rootcanal/Android.bp b/tools/rootcanal/Android.bp
index 386de787e7..910ca1b22a 100644
--- a/tools/rootcanal/Android.bp
+++ b/tools/rootcanal/Android.bp
@@ -38,7 +38,7 @@ cc_defaults {
misc_undefined: ["bounds"],
},
c_std: "c99",
- cpp_std: "c++17",
+ cpp_std: "c++20",
cflags: [
"-DGOOGLE_PROTOBUF_NO_RTTI",
"-Wall",