From 9af75267572f794178354ab39bd8e611eadf3ab0 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 27 Jul 2020 16:25:13 -0700 Subject: [PATCH] ANDROID: build: update ABI definitions Update these defines to be inclusive: * KMI_WHITELIST -> KMI_SYMBOL_LIST * ADDITIONAL_KMI_WHITELISTS -> ADDITIONAL_KMI_SYMBOL_LISTS * KMI_WHITELIST_STRICT_MODE -> KMI_SYMBOL_LIST_STRICT_MODE Change-Id: Ie247fb7a1ef9ff27c06003ab0861fc9a790b10c6 Signed-off-by: Will McVicker Bug: 161912438 --- build.config.gki-debug.aarch64 | 2 +- build.config.gki-debug.x86_64 | 2 +- build.config.gki.aarch64 | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.config.gki-debug.aarch64 b/build.config.gki-debug.aarch64 index f22aaaa437e2..58cee7a6362b 100644 --- a/build.config.gki-debug.aarch64 +++ b/build.config.gki-debug.aarch64 @@ -1,3 +1,3 @@ . ${ROOT_DIR}/common/build.config.gki.aarch64 TRIM_NONLISTED_KMI="" -KMI_WHITELIST_STRICT_MODE="" +KMI_SYMBOL_LIST_STRICT_MODE="" diff --git a/build.config.gki-debug.x86_64 b/build.config.gki-debug.x86_64 index 20dfbf396d7a..9ee51e7de18c 100644 --- a/build.config.gki-debug.x86_64 +++ b/build.config.gki-debug.x86_64 @@ -1,3 +1,3 @@ . ${ROOT_DIR}/common/build.config.gki.x86_64 TRIM_NONLISTED_KMI="" -KMI_WHITELIST_STRICT_MODE="" +KMI_SYMBOL_LIST_STRICT_MODE="" diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 983c5fff8aa9..8f88343358ce 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -3,8 +3,8 @@ . ${ROOT_DIR}/common/build.config.gki ABI_DEFINITION=android/abi_gki_aarch64.xml -KMI_WHITELIST=android/abi_gki_aarch64 -ADDITIONAL_KMI_WHITELISTS=" +KMI_SYMBOL_LIST=android/abi_gki_aarch64 +ADDITIONAL_KMI_SYMBOL_LISTS=" android/abi_gki_aarch64_cuttlefish android/abi_gki_aarch64_db845c android/abi_gki_aarch64_exynos @@ -15,5 +15,5 @@ android/abi_gki_aarch64_sunxi android/abi_gki_aarch64_unisoc " TRIM_NONLISTED_KMI=1 -KMI_WHITELIST_STRICT_MODE=1 +KMI_SYMBOL_LIST_STRICT_MODE=1 KMI_ENFORCED=1