lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: drop KERNEL_DIR setting in build.config.common

Browse Source 
And replace many references of ${ROOT_DIR}/common with
${ROOT_DIR}/${KERNEL_DIR}, which makes it a lot easier
to branch off of ACK and update the KERNEL_DIR.

The variable of KERNEL_DIR will be set in build/_setup_env.sh
to the directory of the build config file by default if it's
not set explicitly in the build config file or in environment.

Test: build test with following configs
        common/build.config.gki.aarch64
        common/build.config.db845c
        common/build.config.hikey960
        common-modules/virtual-device/build.config.cuttlefish.aarch64
        common-modules/virtual-device/build.config.goldfish.aarch64

Bug: 162785964
Change-Id: I790ac0ded10bd790484f14c6f93d53e06c38b830
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
(cherry picked from commit 931718fa65fe5e34d143250c048f591a7d74e5f8)
This commit is contained in:
Will McVicker 2020-08-03 16:18:08 -07:00 committed by Yongqin Liu
parent e32adae0a6
commit b8f04a0f4a
13 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.config.allmodconfig.aarch64
View File

@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
. ${ROOT_DIR}/common/build.config.allmodconfig . ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig

6
build.config.allmodconfig.arm
View File

@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.arm . ${ROOT_DIR}/${KERNEL_DIR}/build.config.arm
. ${ROOT_DIR}/common/build.config.allmodconfig . ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig

6
build.config.allmodconfig.x86_64
View File

@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.x86_64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
. ${ROOT_DIR}/common/build.config.allmodconfig . ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig

1
build.config.common
View File

@ -1,6 +1,5 @@
BRANCH=android11-5.4 BRANCH=android11-5.4
KMI_GENERATION=0 KMI_GENERATION=0
KERNEL_DIR=common
CC=clang CC=clang
LD=ld.lld LD=ld.lld

8
build.config.db845c
View File

@ -1,10 +1,10 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
BUILD_INITRAMFS=1 BUILD_INITRAMFS=1
DEFCONFIG=db845c_gki_defconfig DEFCONFIG=db845c_gki_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" PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_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/db845c_gki.fragment"
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}" POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
FILES=" FILES="
arch/arm64/boot/Image.gz arch/arm64/boot/Image.gz

2
build.config.gki-debug.aarch64
View File

@ -1,3 +1,3 @@
. ${ROOT_DIR}/common/build.config.gki.aarch64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64
TRIM_NONLISTED_KMI="" TRIM_NONLISTED_KMI=""
KMI_SYMBOL_LIST_STRICT_MODE="" KMI_SYMBOL_LIST_STRICT_MODE=""

2
build.config.gki-debug.x86_64
View File

@ -1,3 +1,3 @@
. ${ROOT_DIR}/common/build.config.gki.x86_64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.x86_64
TRIM_NONLISTED_KMI="" TRIM_NONLISTED_KMI=""
KMI_SYMBOL_LIST_STRICT_MODE="" KMI_SYMBOL_LIST_STRICT_MODE=""

6
build.config.gki.aarch64
View File

@ -1,6 +1,6 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
. ${ROOT_DIR}/common/build.config.gki . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
ABI_DEFINITION=android/abi_gki_aarch64.xml ABI_DEFINITION=android/abi_gki_aarch64.xml
KMI_SYMBOL_LIST=android/abi_gki_aarch64 KMI_SYMBOL_LIST=android/abi_gki_aarch64

6
build.config.gki.x86_64
View File

@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.x86_64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
. ${ROOT_DIR}/common/build.config.gki . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki

1
build.config.gki_kasan
View File

@ -1,6 +1,5 @@
DEFCONFIG=gki_defconfig DEFCONFIG=gki_defconfig
POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config" POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
KERNEL_DIR=common
function update_kasan_config() { function update_kasan_config() {
${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \ ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
-e CONFIG_KASAN \ -e CONFIG_KASAN \

7
build.config.gki_kasan.aarch64
View File

@ -1,4 +1,3 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
. ${ROOT_DIR}/common/build.config.gki_kasan . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan

6
build.config.gki_kasan.x86_64
View File

@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.x86_64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
. ${ROOT_DIR}/common/build.config.gki_kasan . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan

8
build.config.hikey960
View File

@ -1,9 +1,9 @@
. ${ROOT_DIR}/common/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
DEFCONFIG=hikey960_gki_defconfig DEFCONFIG=hikey960_gki_defconfig
PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/arch/arm64/configs/hikey960_gki.fragment > ./common/arch/arm64/configs/${DEFCONFIG};" PRE_DEFCONFIG_CMDS="cat ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/hikey960_gki.fragment > ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG};"
POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}" POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
EXT_MODULES=" EXT_MODULES="
hikey-modules/midgard hikey-modules/midgard