Skip to content

Commit 04d51f3

Browse files
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.cuttlefish.aarch64 Bug: 162785964 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I5da16e14cf79275622c03daca5c9e9b3e630e948
1 parent 93599f6 commit 04d51f3

3 files changed

+4
-5
lines changed

build.config.common

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
BRANCH=android-4.14
2-
KERNEL_DIR=common
32

43
CC=clang
54
LD=ld.lld

build.config.cuttlefish.aarch64

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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
LZ4_RAMDISK=1
55
DEFCONFIG=cuttlefish_defconfig

build.config.cuttlefish.x86_64

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

44
LZ4_RAMDISK=1
55
DEFCONFIG=x86_64_cuttlefish_defconfig

0 commit comments

Comments
 (0)