Reland "Consistently prepend arch-specific headers"
This reverts commit cacb972dcda2ee9e537af467f04f1e8cb1b7cb4f.
Relanding along with one more fix in prebuilts/ndk
Change-Id: I65cbc3c5d72bb47bd00e123c63911c9baa1e5f03
Test: m checkbuild
diff --git a/cc/cc_test.go b/cc/cc_test.go
index 2d0d78b..ef413fe 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -4345,12 +4345,12 @@
"${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",