Skip to content

Commit

Permalink
ANDROID: drop KERNEL_DIR setting in build.config.common
Browse files Browse the repository at this point in the history 
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-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 <[email protected]>
Signed-off-by: Yongqin Liu <[email protected]>
(cherry picked from commit 931718fa65fe5e34d143250c048f591a7d74e5f8)
  • Loading branch information
@liuyq
Will McVicker authored and liuyq committed Sep 25, 2020
1 parent 0b8c61c commit e2a92b6
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 26 deletions.
6 changes: 3 additions & 3 deletions build.config.allmodconfig.aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64
. ${ROOT_DIR}/common/build.config.allmodconfig
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig

6 changes: 3 additions & 3 deletions build.config.allmodconfig.arm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common
. ${ROOT_DIR}/common/build.config.arm
. ${ROOT_DIR}/common/build.config.allmodconfig
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.arm
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig

6 changes: 3 additions & 3 deletions build.config.allmodconfig.x86_64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common
. ${ROOT_DIR}/common/build.config.x86_64
. ${ROOT_DIR}/common/build.config.allmodconfig
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig

1 change: 0 additions & 1 deletion build.config.common
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
BRANCH=android-4.19-stable
KMI_GENERATION=0
KERNEL_DIR=common

CC=clang
LD=ld.lld
Expand Down
2 changes: 1 addition & 1 deletion build.config.gki-debug.aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
. ${ROOT_DIR}/common/build.config.gki.aarch64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64
TRIM_NONLISTED_KMI=""
KMI_SYMBOL_LIST_STRICT_MODE=""
2 changes: 1 addition & 1 deletion build.config.gki-debug.x86_64
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
. ${ROOT_DIR}/common/build.config.gki.x86_64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.x86_64
TRIM_NONLISTED_KMI=""
KMI_SYMBOL_LIST_STRICT_MODE=""
6 changes: 3 additions & 3 deletions build.config.gki.aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
. ${ROOT_DIR}/common/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64
. ${ROOT_DIR}/common/build.config.gki
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki

ABI_DEFINITION=android/abi_gki_aarch64.xml
KMI_SYMBOL_LIST=android/abi_gki_aarch64
Expand Down
6 changes: 3 additions & 3 deletions build.config.gki.x86_64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common
. ${ROOT_DIR}/common/build.config.x86_64
. ${ROOT_DIR}/common/build.config.gki
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki

1 change: 0 additions & 1 deletion build.config.gki_kasan
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
DEFCONFIG=gki_defconfig
POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
KERNEL_DIR=common
function update_kasan_config() {
${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
-e CONFIG_KASAN \
Expand Down
7 changes: 3 additions & 4 deletions build.config.gki_kasan.aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
. ${ROOT_DIR}/common/build.config.common
. ${ROOT_DIR}/common/build.config.aarch64
. ${ROOT_DIR}/common/build.config.gki_kasan

. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan
6 changes: 3 additions & 3 deletions build.config.gki_kasan.x86_64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
. ${ROOT_DIR}/common/build.config.common
. ${ROOT_DIR}/common/build.config.x86_64
. ${ROOT_DIR}/common/build.config.gki_kasan
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan

0 comments on commit e2a92b6

Please sign in to comment.