Reland "Consistently prepend arch-specific headers"

This reverts commit cacb972dcd.

Relanding along with one more fix in prebuilts/ndk

Change-Id: I65cbc3c5d72bb47bd00e123c63911c9baa1e5f03
Test: m checkbuild
This commit is contained in:
Colin Cross
2021-06-29 00:51:12 +00:00
parent cacb972dcd
commit 0ed579efd9
3 changed files with 8 additions and 8 deletions

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",