Revert "Consistently prepend arch-specific headers"
This reverts commit e945a4d212edd9c15805b9787e9a56f214244431.
Reason for revert: broke full-eng checkbuild
Change-Id: I0036fed96aa727b63c16982151fd661923e77e59
diff --git a/cc/cc_test.go b/cc/cc_test.go
index ef413fe..2d0d78b 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -4345,12 +4345,12 @@
"${config.ArmToolchainClangCflags}",
"${config.ArmClangArmv7ANeonCflags}",
"${config.ArmClangGenericCflags}",
- "android_arm_export_include_dirs",
- "lib32_export_include_dirs",
- "arm_export_include_dirs",
- "android_export_include_dirs",
- "linux_export_include_dirs",
"export_include_dirs",
+ "linux_export_include_dirs",
+ "android_export_include_dirs",
+ "arm_export_include_dirs",
+ "lib32_export_include_dirs",
+ "android_arm_export_include_dirs",
"android_arm_local_include_dirs",
"lib32_local_include_dirs",
"arm_local_include_dirs",