commit 29a7da8efa8ef244ab06ef4f0d38e59ad119cede
author Steve Muckle <smuckle@google.com> Wed Oct 03 17:26:58 2018 -0700
committer Yifan Hong <elsk@google.com> Mon Oct 15 15:38:10 2018 -0700
tree 3e18cba29c09f9fea6448ce66ebbf8ce78a89db6
parent 502af9def971e2ad9477370418d9a952a21f33ab

remove architecture-specific config fragments

The architecture-specific configs are now expressed as part of the
conditional configs in android-base-conditional.xml.

Test: pass

Change-Id: I3e144ed41733050b436ab17e03930437cf6a75b3

android-4.14/android-base-arm.config

diff --git a/android-4.14/android-base-arm.config b/android-4.14/android-base-arm.config
deleted file mode 100644
index 42c017c..0000000
--- a/android-4.14/android-base-arm.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_DEVKMEM is not set
-# CONFIG_OABI_COMPAT is not set
-CONFIG_AEABI=y
-CONFIG_CPU_SW_DOMAIN_PAN=y

android-4.14/android-base-arm64.config

diff --git a/android-4.14/android-base-arm64.config b/android-4.14/android-base-arm64.config
deleted file mode 100644
index 842b33d..0000000
--- a/android-4.14/android-base-arm64.config
+++ /dev/null
@@ -1,7 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_COMPAT=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
-CONFIG_SWP_EMULATION=y
-CONFIG_UNMAP_KERNEL_AT_EL0=y

android-4.14/android-base-x86.config

diff --git a/android-4.14/android-base-x86.config b/android-4.14/android-base-x86.config
deleted file mode 100644
index 81b1329..0000000
--- a/android-4.14/android-base-x86.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_DEVKMEM is not set
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_RETPOLINE=y

android-4.4/android-base-arm.config

diff --git a/android-4.4/android-base-arm.config b/android-4.4/android-base-arm.config
deleted file mode 100644
index 84570d0..0000000
--- a/android-4.4/android-base-arm.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_OABI_COMPAT is not set
-CONFIG_AEABI=y
-CONFIG_CPU_SW_DOMAIN_PAN=y

android-4.4/android-base-arm64.config

diff --git a/android-4.4/android-base-arm64.config b/android-4.4/android-base-arm64.config
deleted file mode 100644
index db0547e..0000000
--- a/android-4.4/android-base-arm64.config
+++ /dev/null
@@ -1,8 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_COMPAT=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
-CONFIG_SWP_EMULATION=y
-CONFIG_UNMAP_KERNEL_AT_EL0=y

android-4.4/android-base-x86.config

diff --git a/android-4.4/android-base-x86.config b/android-4.4/android-base-x86.config
deleted file mode 100644
index b48983a..0000000
--- a/android-4.4/android-base-x86.config
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_RETPOLINE=y

android-4.9/android-base-arm.config

diff --git a/android-4.9/android-base-arm.config b/android-4.9/android-base-arm.config
deleted file mode 100644
index 84570d0..0000000
--- a/android-4.9/android-base-arm.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_OABI_COMPAT is not set
-CONFIG_AEABI=y
-CONFIG_CPU_SW_DOMAIN_PAN=y

android-4.9/android-base-arm64.config

diff --git a/android-4.9/android-base-arm64.config b/android-4.9/android-base-arm64.config
deleted file mode 100644
index db0547e..0000000
--- a/android-4.9/android-base-arm64.config
+++ /dev/null
@@ -1,8 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_COMPAT=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
-CONFIG_SWP_EMULATION=y
-CONFIG_UNMAP_KERNEL_AT_EL0=y

android-4.9/android-base-x86.config

diff --git a/android-4.9/android-base-x86.config b/android-4.9/android-base-x86.config
deleted file mode 100644
index b48983a..0000000
--- a/android-4.9/android-base-x86.config
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_RETPOLINE=y