From 924e8b8f3373be66e87c8a92227f8a6c134866da Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Tue, 31 Mar 2020 17:11:04 -0700 Subject: [PATCH] ANDROID: db845c build: Use merge_configs Previously the db845c build was cat'ng the db845c_gki.fragment with the gki_defconfig. The correct way to merge fragments is to use the merge_configs script. Bug: 152231482 Test: Treehugger Signed-off-by: Todd Kjos Change-Id: I32d5d6576bb4bdc115b32e7e7ef3ef1e9daa2323 --- build.config.db845c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.config.db845c b/build.config.db845c index 573b1f839e69..708800e5e4d0 100644 --- a/build.config.db845c +++ b/build.config.db845c @@ -2,8 +2,8 @@ . ${ROOT_DIR}/common/build.config.aarch64 DEFCONFIG=db845c_gki_defconfig -PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/arch/arm64/configs/db845c_gki.fragment > ./common/arch/arm64/configs/${DEFCONFIG};" -POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}" +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/common/arch/arm64/configs/db845c_gki.fragment" +POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}" MAKE_GOALS="${MAKE_GOALS} qcom/sdm845-db845c.dtb