mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-10-23 07:34:24 +02:00
ANDROID: GKI: Source GKI_BUILD_CONFIG_FRAGMENT after setting all variables
build.config.gki sources a GKI_BUILD_CONFIG_FRAGMENT before all of
the variables that are considered as part of a GKI kernel build are
declared. This reduces the effectiveness of a
GKI_BUILD_CONFIG_FRAGMENT, as it is only able to modify a subset of
the build variables.
Thus, move the logic to source GKI_BUILD_CONFIG_FRAGMENT to the end
of the GKI build config files to provide more flexibility for a
GKI_BUILD_CONFIG_FRAGMENT.
Bug: 262930113
Change-Id: I74abb45f9043acce04cb0052f54fded4340a9366
[isaacmanjarres: Modified build.config.gki.riscv64, which did not
exist on android13-5.15.]
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
(cherry picked from commit 69fefbb3db
)
This commit is contained in:
parent
2c53a4e8b0
commit
8fcbb1f84e
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user