diff options
| -rw-r--r-- | Android.bp | 2 | ||||
| -rwxr-xr-x | system/test/tool/mockcify.pl | 2 | ||||
| -rw-r--r-- | tools/rootcanal/Android.bp | 2 |
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", |