Consistently prepend arch-specific headers

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

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