aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2020-07-06 09:08:44 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2020-07-06 14:13:46 +0200
commit056684c0d252f75c13be4abb7408f692eedab653 (patch)
treef335858bfc8d106641642c95ec8008a816b48e9a
parent9c233e34cecfaaeace4ea220775ae7d00f714922 (diff)
ANDROID: GKI: move abi files to android/ASB-2020-07-05_5.4-stable
It's good to move the abi files out of the root kernel directory, so move them to android/ to make it obvious these are add-on things, not anything that is upstream. Bug: 155573384 Cc: Matthias Maennich <maennich@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I9f6c2269a1c4e8e4233971adc805cb7584d455f9
-rw-r--r--android/abi_gki_aarch64 (renamed from abi_gki_aarch64)0
-rw-r--r--android/abi_gki_aarch64.xml (renamed from abi_gki_aarch64.xml)0
-rw-r--r--android/abi_gki_aarch64_cuttlefish (renamed from abi_gki_aarch64_cuttlefish)0
-rw-r--r--android/abi_gki_aarch64_db845c (renamed from abi_gki_aarch64_db845c)0
-rw-r--r--android/abi_gki_aarch64_exynos (renamed from abi_gki_aarch64_exynos)0
-rw-r--r--android/abi_gki_aarch64_goldfish (renamed from abi_gki_aarch64_goldfish)0
-rw-r--r--android/abi_gki_aarch64_hikey960 (renamed from abi_gki_aarch64_hikey960)0
-rw-r--r--android/abi_gki_aarch64_qcom (renamed from abi_gki_aarch64_qcom)0
-rw-r--r--android/abi_gki_aarch64_sunxi (renamed from abi_gki_aarch64_sunxi)0
-rw-r--r--android/abi_gki_aarch64_unisoc (renamed from abi_gki_aarch64_unisoc)0
-rw-r--r--build.config.gki.aarch6420
11 files changed, 10 insertions, 10 deletions
diff --git a/abi_gki_aarch64 b/android/abi_gki_aarch64
index 233ea230c8b5..233ea230c8b5 100644
--- a/abi_gki_aarch64
+++ b/android/abi_gki_aarch64
diff --git a/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index db021ab97cb1..db021ab97cb1 100644
--- a/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
diff --git a/abi_gki_aarch64_cuttlefish b/android/abi_gki_aarch64_cuttlefish
index 695404407f36..695404407f36 100644
--- a/abi_gki_aarch64_cuttlefish
+++ b/android/abi_gki_aarch64_cuttlefish
diff --git a/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c
index d717e52c9517..d717e52c9517 100644
--- a/abi_gki_aarch64_db845c
+++ b/android/abi_gki_aarch64_db845c
diff --git a/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos
index 920675645d63..920675645d63 100644
--- a/abi_gki_aarch64_exynos
+++ b/android/abi_gki_aarch64_exynos
diff --git a/abi_gki_aarch64_goldfish b/android/abi_gki_aarch64_goldfish
index be17c303b5fe..be17c303b5fe 100644
--- a/abi_gki_aarch64_goldfish
+++ b/android/abi_gki_aarch64_goldfish
diff --git a/abi_gki_aarch64_hikey960 b/android/abi_gki_aarch64_hikey960
index 70d87de71aa3..70d87de71aa3 100644
--- a/abi_gki_aarch64_hikey960
+++ b/android/abi_gki_aarch64_hikey960
diff --git a/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index cc39a72fdb37..cc39a72fdb37 100644
--- a/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
diff --git a/abi_gki_aarch64_sunxi b/android/abi_gki_aarch64_sunxi
index d8b8c1998f29..d8b8c1998f29 100644
--- a/abi_gki_aarch64_sunxi
+++ b/android/abi_gki_aarch64_sunxi
diff --git a/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc
index 41d2e462fb2e..41d2e462fb2e 100644
--- a/abi_gki_aarch64_unisoc
+++ b/android/abi_gki_aarch64_unisoc
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 2ea771f9d297..983c5fff8aa9 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -2,17 +2,17 @@
. ${ROOT_DIR}/common/build.config.aarch64
. ${ROOT_DIR}/common/build.config.gki
-ABI_DEFINITION=abi_gki_aarch64.xml
-KMI_WHITELIST=abi_gki_aarch64
+ABI_DEFINITION=android/abi_gki_aarch64.xml
+KMI_WHITELIST=android/abi_gki_aarch64
ADDITIONAL_KMI_WHITELISTS="
-abi_gki_aarch64_cuttlefish
-abi_gki_aarch64_db845c
-abi_gki_aarch64_exynos
-abi_gki_aarch64_goldfish
-abi_gki_aarch64_hikey960
-abi_gki_aarch64_qcom
-abi_gki_aarch64_sunxi
-abi_gki_aarch64_unisoc
+android/abi_gki_aarch64_cuttlefish
+android/abi_gki_aarch64_db845c
+android/abi_gki_aarch64_exynos
+android/abi_gki_aarch64_goldfish
+android/abi_gki_aarch64_hikey960
+android/abi_gki_aarch64_qcom
+android/abi_gki_aarch64_sunxi
+android/abi_gki_aarch64_unisoc
"
TRIM_NONLISTED_KMI=1
KMI_WHITELIST_STRICT_MODE=1