Skip to content

Commit 67a1d5d

Browse files
Will McVickerJ. Avila
Will McVicker
authored and
J. Avila
committed
ANDROID: drop KERNEL_DIR setting in build.config.common
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 cuttlefish-modules/build.config.cuttlefish.aarch64 Bug: 162785964 Change-Id: I790ac0ded10bd790484f14c6f93d53e06c38b830 Signed-off-by: Will McVicker <[email protected]> Signed-off-by: Yongqin Liu <[email protected]> (cherry picked from commit 931718fa65fe5e34d143250c048f591a7d74e5f8) [elavila: resolve conflicts] Signed-off-by: J. Avila <[email protected]>
1 parent d6ce3ab commit 67a1d5d

11 files changed

+27
-28
lines changed

‎build.config.allmodconfig.aarch64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.aarch64
3-
. ${ROOT_DIR}/common/build.config.allmodconfig
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
3+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
44

‎build.config.allmodconfig.arm

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.arm
3-
. ${ROOT_DIR}/common/build.config.allmodconfig
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.arm
3+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
44

‎build.config.allmodconfig.x86_64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.x86_64
3-
. ${ROOT_DIR}/common/build.config.allmodconfig
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
3+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
44

‎build.config.common

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
BRANCH=android-mainline
22
KMI_GENERATION=0
3-
KERNEL_DIR=common
43

54
CC=clang
65
LD=ld.lld

‎build.config.db845c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.aarch64
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
33

44
BUILD_INITRAMFS=1
55
DEFCONFIG=db845c_gki_defconfig
6-
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"
7-
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}"
6+
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"
7+
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
88

99
MAKE_GOALS="${MAKE_GOALS}
1010
qcom/sdm845-db845c.dtb

‎build.config.gki-debug.aarch64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
. ${ROOT_DIR}/common/build.config.gki.aarch64
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64
22
TRIM_NONLISTED_KMI=""
33
KMI_SYMBOL_LIST_STRICT_MODE=""

‎build.config.gki-debug.x86_64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
. ${ROOT_DIR}/common/build.config.gki.x86_64
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.x86_64
22
TRIM_NONLISTED_KMI=""
33
KMI_SYMBOL_LIST_STRICT_MODE=""

‎build.config.gki.aarch64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.aarch64
3-
. ${ROOT_DIR}/common/build.config.gki
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
3+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
44

‎build.config.gki.x86_64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.x86_64
3-
. ${ROOT_DIR}/common/build.config.gki
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
3+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
44

‎build.config.gki_kasan.aarch64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.aarch64
3-
. ${ROOT_DIR}/common/build.config.gki_kasan
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
3+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan

‎build.config.gki_kasan.x86_64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
. ${ROOT_DIR}/common/build.config.common
2-
. ${ROOT_DIR}/common/build.config.x86_64
3-
. ${ROOT_DIR}/common/build.config.gki_kasan
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
3+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan
44

0 commit comments

Comments
 (0)