From 9dc6577d55eb575afdaa0bb813d2bc933a93a3ba Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 16 Dec 2021 11:38:50 -0500 Subject: [PATCH] Add -std user flags to cc test to ensure order Test: go test soong tests Change-Id: Iff2b82f59e138089d1c1726d9b51e040b00340ba --- cc/cc_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cc/cc_test.go b/cc/cc_test.go index bcc6fcd36..31d91b663 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -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"],