Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ed579ef authored by Colin Cross's avatar Colin Cross
Browse files

Reland "Consistently prepend arch-specific headers" 

This reverts commit cacb972d.

Relanding along with one more fix in prebuilts/ndk

Change-Id: I65cbc3c5d72bb47bd00e123c63911c9baa1e5f03
Test: m checkbuild
parent cacb972d

cc/cc_test.go

+5 −5
Original line number Diff line number Diff line
@@ -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",

cc/compiler.go

+1 −1
Original line number Diff line number Diff line
@@ -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

cc/library.go

+2 −2
Original line number Diff line number Diff line
@@ -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 {