From cacb972dcda2ee9e537af467f04f1e8cb1b7cb4f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 28 Jun 2021 23:58:59 +0000
Subject: [PATCH] Revert "Consistently prepend arch-specific headers"

This reverts commit e945a4d212edd9c15805b9787e9a56f214244431.

Reason for revert: broke full-eng checkbuild

Change-Id: I0036fed96aa727b63c16982151fd661923e77e59
---
 cc/cc_test.go  | 10 +++++-----
 cc/compiler.go |  2 +-
 cc/library.go  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cc/cc_test.go b/cc/cc_test.go
index ef413fe42..2d0d78b86 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -4345,12 +4345,12 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
 		"${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",
diff --git a/cc/compiler.go b/cc/compiler.go
index 69ead3089..78a5a5da3 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -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,variant_prepend"`
+	Generated_headers []string `android:"arch_variant"`
 
 	// pass -frtti instead of -fno-rtti
 	Rtti *bool
diff --git a/cc/library.go b/cc/library.go
index 196d57579..93bd56c6f 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -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,variant_prepend"`
+	Export_include_dirs []string `android:"arch_variant"`
 
 	// 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,variant_prepend"`
+	Export_system_include_dirs []string `android:"arch_variant"`
 
 	Target struct {
 		Vendor, Product struct {