StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add -std user flags to cc test to ensure order" am: fac51eb8fd am: 215682ac05

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925818

Change-Id: If1ed95f8c550661e4fec97670cbff39da19f5d12
This commit is contained in:
Treehugger Robot
2021-12-21 22:39:00 +00:00
committed by Automerger Merge Worker
parent a185769983 215682ac05
commit 376070fbc3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/cc_test.go
View File

@@ -3980,9 +3980,9 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"}
cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"}
cflags := []string{"-Wall", "-Werror"}
cstd := []string{"-std=gnu99"}
cppstd := []string{"-std=gnu++17", "-fno-rtti"}
cflags := []string{"-Wall", "-Werror", "-std=candcpp"}
cstd := []string{"-std=gnu99", "-std=conly"}
cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}
lastIncludes := []string{
"out/soong/ndk/sysroot/usr/include",
@@ -4025,6 +4025,9 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
cc_library {
name: "libfoo",
srcs: ["%s"],
cflags: ["-std=candcpp"],
conlyflags: ["-std=conly"],
cppflags: ["-std=cpp"],
local_include_dirs: ["local_include_dirs"],
export_include_dirs: ["export_include_dirs"],
export_system_include_dirs: ["export_system_include_dirs"],