diff --git a/build.config.gki b/build.config.gki index 8a13ddd696ab..4b931d9eb333 100644 --- a/build.config.gki +++ b/build.config.gki @@ -1,6 +1,2 @@ DEFCONFIG=gki_defconfig POST_DEFCONFIG_CMDS="check_defconfig" - -if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then -source ${GKI_BUILD_CONFIG_FRAGMENT} -fi diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 17dec7a82c7a..709af184d7aa 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -21,3 +21,7 @@ BUILD_GKI_ARTIFACTS=1 BUILD_GKI_BOOT_IMG_SIZE=67108864 BUILD_GKI_BOOT_IMG_GZ_SIZE=47185920 BUILD_GKI_BOOT_IMG_LZ4_SIZE=53477376 + +if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then +source ${GKI_BUILD_CONFIG_FRAGMENT} +fi diff --git a/build.config.gki.riscv64 b/build.config.gki.riscv64 index 0eb01c4975de..8215d16e95ba 100644 --- a/build.config.gki.riscv64 +++ b/build.config.gki.riscv64 @@ -24,3 +24,7 @@ BUILD_GKI_BOOT_IMG_LZ4_SIZE=53477376 PRE_DEFCONFIG_CMDS="mkdir -p \${OUT_DIR}/arch/riscv/configs/ && cat ${ROOT_DIR}/${KERNEL_DIR}/arch/riscv/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/riscv/configs/64-bit.config ${ROOT_DIR}/${KERNEL_DIR}/arch/riscv/configs/gki.config > \${OUT_DIR}/arch/riscv/configs/${DEFCONFIG};" POST_DEFCONFIG_CMDS="" + +if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then +source ${GKI_BUILD_CONFIG_FRAGMENT} +fi diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64 index 3d81fea6aacb..93f492cabec8 100644 --- a/build.config.gki.x86_64 +++ b/build.config.gki.x86_64 @@ -9,3 +9,7 @@ BUILD_GKI_CERTIFICATION_TOOLS=1 BUILD_GKI_ARTIFACTS=1 BUILD_GKI_BOOT_IMG_SIZE=67108864 + +if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then +source ${GKI_BUILD_CONFIG_FRAGMENT} +fi