From c579764ff6aac83c9b2bc82e15b02fbdc7c6c529 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Jul 2020 09:08:44 +0200 Subject: [PATCH] ANDROID: GKI: move abi files to android/ 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 Signed-off-by: Greg Kroah-Hartman Change-Id: I9f6c2269a1c4e8e4233971adc805cb7584d455f9 --- abi_gki_aarch64 => android/abi_gki_aarch64 | 0 abi_gki_aarch64.xml => android/abi_gki_aarch64.xml | 0 .../abi_gki_aarch64_cuttlefish | 0 abi_gki_aarch64_qcom => android/abi_gki_aarch64_qcom | 0 build.config.gki.aarch64 | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename abi_gki_aarch64 => android/abi_gki_aarch64 (100%) rename abi_gki_aarch64.xml => android/abi_gki_aarch64.xml (100%) rename abi_gki_aarch64_cuttlefish => android/abi_gki_aarch64_cuttlefish (100%) rename abi_gki_aarch64_qcom => android/abi_gki_aarch64_qcom (100%) diff --git a/abi_gki_aarch64 b/android/abi_gki_aarch64 similarity index 100% rename from abi_gki_aarch64 rename to android/abi_gki_aarch64 diff --git a/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml similarity index 100% rename from abi_gki_aarch64.xml rename to android/abi_gki_aarch64.xml diff --git a/abi_gki_aarch64_cuttlefish b/android/abi_gki_aarch64_cuttlefish similarity index 100% rename from abi_gki_aarch64_cuttlefish rename to android/abi_gki_aarch64_cuttlefish diff --git a/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom similarity index 100% rename from abi_gki_aarch64_qcom rename to android/abi_gki_aarch64_qcom diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index d84cfe6bd5d9..832f53656f82 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -2,11 +2,11 @@ . ${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_qcom +android/abi_gki_aarch64_cuttlefish +android/abi_gki_aarch64_qcom " TRIM_NONLISTED_KMI=1 KMI_WHITELIST_STRICT_MODE=1