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 <tkjos@google.com> Change-Id: I32d5d6576bb4bdc115b32e7e7ef3ef1e9daa2323
This commit is contained in:
parent
8e8c63d051
commit
9bb4e91b94
@ -2,8 +2,8 @@
|
|||||||
. ${ROOT_DIR}/common/build.config.aarch64
|
. ${ROOT_DIR}/common/build.config.aarch64
|
||||||
|
|
||||||
DEFCONFIG=db845c_gki_defconfig
|
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};"
|
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 ./common/arch/arm64/configs/${DEFCONFIG}"
|
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}"
|
||||||
|
|
||||||
FILES="
|
FILES="
|
||||||
arch/arm64/boot/Image.gz
|
arch/arm64/boot/Image.gz
|
||||||
|
Loading…
Reference in New Issue
Block a user