diff options
| -rw-r--r-- | build.config.goldfish.aarch64 | 2 | ||||
| -rw-r--r-- | build.config.goldfish.x86_64 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build.config.goldfish.aarch64 b/build.config.goldfish.aarch64 index df9efdd..9f0fb8d 100644 --- a/build.config.goldfish.aarch64 +++ b/build.config.goldfish.aarch64 @@ -3,5 +3,5 @@ DEFCONFIG=goldfish_aarch64_defconfig DEFCONFIG_PATH="${ROOT_DIR}/common/arch/arm64/configs" -PRE_DEFCONFIG_CMDS="cat ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH} > ${DEFCONFIG_PATH}/${DEFCONFIG};" +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${DEFCONFIG_PATH}/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH}" POST_DEFCONFIG_CMDS="rm ${DEFCONFIG_PATH}/${DEFCONFIG}" diff --git a/build.config.goldfish.x86_64 b/build.config.goldfish.x86_64 index fe899ae..7f0362f 100644 --- a/build.config.goldfish.x86_64 +++ b/build.config.goldfish.x86_64 @@ -3,5 +3,5 @@ DEFCONFIG=goldfish_86_64_defconfig DEFCONFIG_PATH="${ROOT_DIR}/common/arch/x86/configs" -PRE_DEFCONFIG_CMDS="cat ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH} > ${DEFCONFIG_PATH}/${DEFCONFIG};" +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${DEFCONFIG_PATH}/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH}" POST_DEFCONFIG_CMDS="rm ${DEFCONFIG_PATH}/${DEFCONFIG}" |