2535deae80
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.aarch64.fips140, which did not exist on android13-5.15.] Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com> (cherry picked from commit 69fefbb3db711e543ff0676526b7d285a4d10a14)
28 lines
815 B
Plaintext
28 lines
815 B
Plaintext
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
|
|
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
|
|
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
|
|
|
|
FILES="
|
|
crypto/fips140.ko
|
|
"
|
|
|
|
MAKE_GOALS="
|
|
modules
|
|
"
|
|
|
|
if [ "${LTO}" = "none" ]; then
|
|
echo "The FIPS140 module needs LTO to be enabled."
|
|
exit 1
|
|
fi
|
|
|
|
MODULES_ORDER=android/gki_aarch64_fips140_modules
|
|
KERNEL_DIR=common
|
|
|
|
DEFCONFIG=fips140_gki_defconfig
|
|
PRE_DEFCONFIG_CMDS="mkdir -p \${OUT_DIR}/arch/arm64/configs/ && KCONFIG_CONFIG=\${OUT_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/fips140_gki.fragment"
|
|
POST_DEFCONFIG_CMDS=""
|
|
|
|
if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then
|
|
source ${GKI_BUILD_CONFIG_FRAGMENT}
|
|
fi
|