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

Merge "Revert "Consistently prepend arch-specific headers"" am: e86698f28a

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

Change-Id: Ibeba5d84fea6799a35900ee5b40d8ee9bf023b56
This commit is contained in:
Colin Cross
2021-06-29 00:09:48 +00:00
committed by Automerger Merge Worker
parent 3835adce04 e86698f28a
commit 0e288ad9e8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/cc_test.go
View File

@@ -4046,12 +4046,12 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
"${config.ArmToolchainClangCflags}",
"${config.ArmClangArmv7ANeonCflags}",
"${config.ArmClangGenericCflags}",
"android_arm_export_include_dirs",
"lib32_export_include_dirs",
"arm_export_include_dirs",
"android_export_include_dirs",
"linux_export_include_dirs",
"export_include_dirs",
"linux_export_include_dirs",
"android_export_include_dirs",
"arm_export_include_dirs",
"lib32_export_include_dirs",
"android_arm_export_include_dirs",
"android_arm_local_include_dirs",
"lib32_local_include_dirs",
"arm_local_include_dirs",

2
cc/compiler.go
View File

@@ -92,7 +92,7 @@ type BaseCompilerProperties struct {
// list of generated headers to add to the include path. These are the names
// of genrule modules.
Generated_headers []string `android:"arch_variant,variant_prepend"`
Generated_headers []string `android:"arch_variant"`
// pass -frtti instead of -fno-rtti
Rtti *bool

4
cc/library.go
View File

@@ -184,11 +184,11 @@ type FlagExporterProperties struct {
// be added to the include path (using -I) for this module and any module that links
// against this module. Directories listed in export_include_dirs do not need to be
// listed in local_include_dirs.
Export_include_dirs []string `android:"arch_variant,variant_prepend"`
Export_include_dirs []string `android:"arch_variant"`
// list of directories that will be added to the system include path
// using -isystem for this module and any module that links against this module.
Export_system_include_dirs []string `android:"arch_variant,variant_prepend"`
Export_system_include_dirs []string `android:"arch_variant"`
Target struct {
Vendor, Product struct {