From 18aada792ea5d71b6482b1d5c9065f8d71d30bcf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 5 Jul 2020 12:19:41 +0200 Subject: [PATCH] ANDROID: GKI: drop unneeded "_whitelist" off of symbol filenames No need for "_whitelist" to be on the abi symbol files, it's just a list of abi symbols we are going to support. Bug: 160578303 Cc: Matthias Maennich Signed-off-by: Greg Kroah-Hartman Change-Id: I0e4c449550f41ff364a09a2987e877a62b986be7 --- abi_gki_aarch64_whitelist => abi_gki_aarch64 | 0 ...rch64_cuttlefish_whitelist => abi_gki_aarch64_cuttlefish | 0 abi_gki_aarch64_qcom_whitelist => abi_gki_aarch64_qcom | 0 build.config.gki.aarch64 | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename abi_gki_aarch64_whitelist => abi_gki_aarch64 (100%) rename abi_gki_aarch64_cuttlefish_whitelist => abi_gki_aarch64_cuttlefish (100%) rename abi_gki_aarch64_qcom_whitelist => abi_gki_aarch64_qcom (100%) diff --git a/abi_gki_aarch64_whitelist b/abi_gki_aarch64 similarity index 100% rename from abi_gki_aarch64_whitelist rename to abi_gki_aarch64 diff --git a/abi_gki_aarch64_cuttlefish_whitelist b/abi_gki_aarch64_cuttlefish similarity index 100% rename from abi_gki_aarch64_cuttlefish_whitelist rename to abi_gki_aarch64_cuttlefish diff --git a/abi_gki_aarch64_qcom_whitelist b/abi_gki_aarch64_qcom similarity index 100% rename from abi_gki_aarch64_qcom_whitelist rename to abi_gki_aarch64_qcom diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 8ceaaff0f7b3..d84cfe6bd5d9 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -3,10 +3,10 @@ . ${ROOT_DIR}/common/build.config.gki ABI_DEFINITION=abi_gki_aarch64.xml -KMI_WHITELIST=abi_gki_aarch64_whitelist +KMI_WHITELIST=abi_gki_aarch64 ADDITIONAL_KMI_WHITELISTS=" -abi_gki_aarch64_cuttlefish_whitelist -abi_gki_aarch64_qcom_whitelist +abi_gki_aarch64_cuttlefish +abi_gki_aarch64_qcom " TRIM_NONLISTED_KMI=1 KMI_WHITELIST_STRICT_MODE=1