commit b9ae3287e3190debceeca51919492b37a07be79e
author Matthias Maennich <maennich@google.com> Fri Jun 11 14:31:48 2021 +0100
committer Matthias Maennich <maennich@google.com> Fri Jun 11 15:04:07 2021 +0000
tree ebcbee1c6516a869559ce762206f35a39904c505
parent 3871aa16fda772f9be298c8c6553f6e38be4ae5d

ANDROID: Fips 140: move fips symbols entirely in own list

Since the fips140 module is not built during the regular GKI kernel
build, it will also not be participating in the symbol list generation.
Yet the symbols were added as if it were built. Fix that by moving the
symbols over to the module specific list for now. Also, update the
symbol list that is updated when using

  BUILD_CONFIG=common/build.config.gki.aarch64.fips140 build/build_abi.sh --update-symbol-list

Fixes: a11dacedd687 ("ANDROID: add fips140.ko symbols to module ABI")
Change-Id: I35730ab72941576d8da699d82b265b2ed1ae6b2b
Signed-off-by: Matthias Maennich <maennich@google.com>

build.config.gki.aarch64.fips140

diff --git a/build.config.gki.aarch64.fips140 b/build.config.gki.aarch64.fips140
index 040d73a..a1a75a8 100644
--- a/build.config.gki.aarch64.fips140
+++ b/build.config.gki.aarch64.fips140
@@ -10,8 +10,8 @@
 fi
 
 MODULES_ORDER=android/gki_aarch64_fips140_modules
-KERNEL_DIR=common
 
 DEFCONFIG=fips140_gki_defconfig
+KMI_SYMBOL_LIST=android/abi_gki_aarch64_fips140
 PRE_DEFCONFIG_CMDS="cat ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/fips140_gki.fragment > ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG};"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"