Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8f04a0f authored by Will McVicker's avatar Will McVicker Committed by Yongqin Liu
Browse files

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
        common-modules/virtual-device/build.config.cuttlefish.aarch64
        common-modules/virtual-device/build.config.goldfish.aarch64

Bug: 162785964
Change-Id: I790ac0ded10bd790484f14c6f93d53e06c38b830
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
Signed-off-by: default avatarYongqin Liu <yongqin.liu@linaro.org>
(cherry picked from commit 931718fa65fe5e34d143250c048f591a7d74e5f8)
parent e32adae0

build.config.allmodconfig.aarch64

+3 −3
Original line number Original line Diff line number Diff line 
. ${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

build.config.allmodconfig.arm

+3 −3
Original line number Original line Diff line number Diff line 
. ${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

build.config.allmodconfig.x86_64

+3 −3
Original line number Original line Diff line number Diff line 
. ${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

build.config.common

+0 −1
Original line number Original line Diff line number Diff line 
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

build.config.db845c

+4 −4
Original line number Original line Diff line number Diff line 
. ${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