anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build.config.msm.gki: Use msm-kernel's consolidate fragment

Browse Source 
Workaround while waiting for commit b857eea667d ("ANDROID: qki: Update
configuration for GKI debug fragment").

Change-Id: I5d4a69061cd5535708185ef9f51eb43578dfa777
Signed-off-by: Blagovest Kolenichev <quic_c_bkolen@quicinc.com>
This commit is contained in:
Blagovest Kolenichev
2021-12-13 15:16:24 -08:00
parent 396f78bd90
commit e82fb03381
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.config.gki_consolidate.aarch64
View File

@@ -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}"

4
build.config.msm.gki
View File

@@ -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