Use c++20 to allow format string checking

Bug: 305066880 Test: mma -j32 Flag: EXEMPT, build infrastructure change Change-Id: Ic60b8a4959e013fd2455a4c85659d4d0f7052b2e
mt6785-wahid · Feb 15, 2024 · dbd43e7 · dbd43e7
1 parent 1f90242
commit dbd43e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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",