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

Consistently prepend arch-specific headers

Browse source 
Add variant_prepend to Export_include_dirs, Export_system_include_dirs
and Generated_headers to match Local_include_dirs so that
architecture-specific headers are found before common headers.

Test: m checkbuild
Test: TestIncludeDirectoryOrdering
Change-Id: I2bf9d4373fd256e500c1f8d6c84cf593e8fdd170
This commit is contained in:
Colin Cross 2021-06-10 13:10:22 -07:00
parent c113e3cbe7
commit e945a4d212
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cc/cc_test.go
View file

@ -4345,12 +4345,12 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
"${config.ArmToolchainClangCflags}",
"${config.ArmClangArmv7ANeonCflags}",
"${config.ArmClangGenericCflags}",
"export_include_dirs",
"linux_export_include_dirs",
"android_export_include_dirs",
"arm_export_include_dirs",
"lib32_export_include_dirs",
"android_arm_export_include_dirs",
"lib32_export_include_dirs",
"arm_export_include_dirs",
"android_export_include_dirs",
"linux_export_include_dirs",
"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"`
Generated_headers []string `android:"arch_variant,variant_prepend"`
// pass -frtti instead of -fno-rtti
Rtti *bool

4
cc/library.go
View file

@ -183,11 +183,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"`
Export_include_dirs []string `android:"arch_variant,variant_prepend"`
// 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"`
Export_system_include_dirs []string `android:"arch_variant,variant_prepend"`
Target struct {
Vendor, Product struct {