From 104be1a452f34116e7dd9dade9d07f6ebd1e5006 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Thu, 28 Apr 2022 18:25:03 -0700 Subject: [PATCH] build.config.msm.gki: Add sanity_check_abi() When running build_abi.sh, mixed build is explicitly disabled. In that case, turn on some options for trimming and strict mode which would normally be disabled because they conflict with mixed build. Change-Id: I545705e14c2f55b72986e579724713de95e08dfd Signed-off-by: Elliot Berman Signed-off-by: Guru Das Srinagesh --- android/abi_gki_aarch64_qcom | 1 + build.config.msm.gki | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index fe665b80c4c1..27f8c1fbada8 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -192,6 +192,7 @@ memset memset memstart_addr + module_layout module_put msleep __mutex_init diff --git a/build.config.msm.gki b/build.config.msm.gki index 9ecdb7c1a517..70acfc2d9e4a 100644 --- a/build.config.msm.gki +++ b/build.config.msm.gki @@ -25,6 +25,21 @@ TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1} GKI_KMI_ENFORCED=1 KMI_ENFORCED=1 +function sanity_check_abi() { + if [ -z "${GKI_BUILD_CONFIG}" ]; then + # When running build_abi.sh, mixed build is explicitly disabled + # In that case, turn on some options for trimming and strict mode + # which would normally be disabled because they conflict with + # mixed build + if [ "${VARIANT}" = gki ]; then + TRIM_NONLISTED_KMI=1 + KMI_SYMBOL_LIST_STRICT_MODE=1 + fi + return + fi +} +append_cmd POST_DEFCONFIG_CMDS 'sanity_check_abi' + function build_defconfig_fragments() { if [[ "${VARIANT}" =~ ^(gki|consolidate)$ ]]; then apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}_GKI.config vendor/${MSM_ARCH}-gki_defconfig