From e82fb0338153c271a49a3a925894bbd97baff26d Mon Sep 17 00:00:00 2001 From: Blagovest Kolenichev Date: Mon, 13 Dec 2021 15:16:24 -0800 Subject: [PATCH] build.config.msm.gki: Use msm-kernel's consolidate fragment Workaround while waiting for commit b857eea667d ("ANDROID: qki: Update configuration for GKI debug fragment"). Change-Id: I5d4a69061cd5535708185ef9f51eb43578dfa777 Signed-off-by: Blagovest Kolenichev --- build.config.gki_consolidate.aarch64 | 2 +- build.config.msm.gki | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.config.gki_consolidate.aarch64 b/build.config.gki_consolidate.aarch64 index 3a4b71507f6d..8cbfd6dec512 100644 --- a/build.config.gki_consolidate.aarch64 +++ b/build.config.gki_consolidate.aarch64 @@ -1,4 +1,4 @@ DEFCONFIG=consolidate_defconfig -FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/consolidate.fragment +FRAGMENT_CONFIG=msm-kernel/arch/arm64/configs/consolidate.fragment PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}" POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}" diff --git a/build.config.msm.gki b/build.config.msm.gki index c548cd24dd51..87cb9ca16cd5 100644 --- a/build.config.msm.gki +++ b/build.config.msm.gki @@ -29,10 +29,10 @@ function build_defconfig_fragments() { return fi GKI_BUILD_CONFIG=common/build.config.gki-debug.aarch64 - GKI_GKI_BUILD_CONFIG_FRAGMENT=common/build.config.gki_consolidate.aarch64 + GKI_GKI_BUILD_CONFIG_FRAGMENT=msm-kernel/build.config.gki_consolidate.aarch64 # ABI comparison isn't applicable on consolidate variant unset ABI_DEFINITION - apply_defconfig_fragment common/arch/${ARCH}/configs/consolidate.fragment consolidate_defconfig + apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/consolidate.fragment consolidate_defconfig apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}_consolidate.config vendor/${MSM_ARCH}-consolidate_defconfig elif [ "${VARIANT}" = gki-ack ]; then # In gki-only, then using ACK's GKI config directly