Merge "Bump the platform default up to C17." am: 1b2a65783d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2626336 Change-Id: Iab415f33b90235c625dac3f2fd97bd94ea91b65b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
02fec85409
2 changed files with 3 additions and 3 deletions
|
@ -4981,7 +4981,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
|
|||
cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"}
|
||||
|
||||
cflags := []string{"-Werror", "-std=candcpp"}
|
||||
cstd := []string{"-std=gnu11", "-std=conly"}
|
||||
cstd := []string{"-std=gnu17", "-std=conly"}
|
||||
cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}
|
||||
|
||||
lastIncludes := []string{
|
||||
|
|
|
@ -298,9 +298,9 @@ var (
|
|||
"-w",
|
||||
}
|
||||
|
||||
CStdVersion = "gnu11"
|
||||
CStdVersion = "gnu17"
|
||||
CppStdVersion = "gnu++17"
|
||||
ExperimentalCStdVersion = "gnu17"
|
||||
ExperimentalCStdVersion = "gnu2x"
|
||||
ExperimentalCppStdVersion = "gnu++2a"
|
||||
|
||||
// prebuilts/clang default settings.
|
||||
|
|
Loading…
Reference in a new issue