tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Bump the platform default up to C17." am: 1b2a65783d

Browse source 
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:
Elliott Hughes 2023-06-20 17:09:42 +00:00 committed by Automerger Merge Worker
commit 02fec85409
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cc/cc_test.go
View file

@ -4981,7 +4981,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"} cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"}
cflags := []string{"-Werror", "-std=candcpp"} 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"} cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}
lastIncludes := []string{ lastIncludes := []string{

4
cc/config/global.go
View file

@ -298,9 +298,9 @@ var (
"-w", "-w",
} }
CStdVersion = "gnu11" CStdVersion = "gnu17"
CppStdVersion = "gnu++17" CppStdVersion = "gnu++17"
ExperimentalCStdVersion = "gnu17" ExperimentalCStdVersion = "gnu2x"
ExperimentalCppStdVersion = "gnu++2a" ExperimentalCppStdVersion = "gnu++2a"
// prebuilts/clang default settings. // prebuilts/clang default settings.