Merge "build.config*: set KERNEL_DIR explicitly" into android-mainlineandroid-mainline

6 files changed, 35 insertions, 42 deletions

diff --git a/build.config.cuttlefish b/build.config.cuttlefish
new file mode 100644
index 0000000..e9b4f1e
--- /dev/null
+++ b/build.config.cuttlefish
@@ -0,0 +1,8 @@
+KERNEL_DIR=common
+
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
+
+BUILD_INITRAMFS=1
+EXT_MODULES="cuttlefish-modules"
+LZ4_RAMDISK=1
diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64
index 7ac4d16..6704ebc 100644
--- a/build.config.cuttlefish.aarch64
+++ b/build.config.cuttlefish.aarch64
@@ -1,13 +1,10 @@
-. ${ROOT_DIR}/common/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
-. ${ROOT_DIR}/common/build.config.gki
+. ${ROOT_DIR}/cuttlefish-modules/build.config.cuttlefish
+
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 
-BUILD_INITRAMFS=1
-EXT_MODULES="cuttlefish-modules"
-LZ4_RAMDISK=1
 DEFCONFIG=cf_aarch_64_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}/cuttlefish-modules/cuttlefish.fragment"
-POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}"
+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}/cuttlefish-modules/cuttlefish.fragment"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
 # Not building/saving any kernel images. This build step is meant purely to generate the .kos.
 FILES=""
diff --git a/build.config.cuttlefish.i686 b/build.config.cuttlefish.i686
index 3e7168c..17af0c0 100644
--- a/build.config.cuttlefish.i686
+++ b/build.config.cuttlefish.i686
@@ -1,12 +1,9 @@
-. ${ROOT_DIR}/common/build.config.common
-. ${ROOT_DIR}/common/build.config.x86_64
-. ${ROOT_DIR}/common/build.config.gki
+. ${ROOT_DIR}/cuttlefish-modules/build.config.cuttlefish
+
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
 
 ARCH=i386
 CLANG_TRIPLE=i686-linux-gnu-
-BUILD_INITRAMFS=1
-EXT_MODULES="cuttlefish-modules"
-LZ4_RAMDISK=1
 DEFCONFIG=cf_x86_gki_defconfig
-PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/x86/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/x86/configs/gki_defconfig ${ROOT_DIR}/cuttlefish-modules/cuttlefish.fragment ${ROOT_DIR}/cuttlefish-modules/i686.fragment"
-POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/x86/configs/${DEFCONFIG}"
+PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/gki_defconfig ${ROOT_DIR}/cuttlefish-modules/cuttlefish.fragment ${ROOT_DIR}/cuttlefish-modules/i686.fragment"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG}"
\ No newline at end of file
diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64
index de3f52a..d389811 100644
--- a/build.config.cuttlefish.x86_64
+++ b/build.config.cuttlefish.x86_64
@@ -1,13 +1,10 @@
-. ${ROOT_DIR}/common/build.config.common
-. ${ROOT_DIR}/common/build.config.x86_64
-. ${ROOT_DIR}/common/build.config.gki
+. ${ROOT_DIR}/cuttlefish-modules/build.config.cuttlefish
+
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
 
-BUILD_INITRAMFS=1
-EXT_MODULES="cuttlefish-modules"
-LZ4_RAMDISK=1
 DEFCONFIG=cf_x86_64_gki_defconfig
-PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/x86/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/x86/configs/gki_defconfig ${ROOT_DIR}/cuttlefish-modules/cuttlefish.fragment"
-POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/x86/configs/${DEFCONFIG}"
+PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/gki_defconfig ${ROOT_DIR}/cuttlefish-modules/cuttlefish.fragment"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG}"
 
 # Not building/saving any kernel images. This build step is meant purely to generate the .kos.
 FILES=""
diff --git a/build.config.cuttlefish_kasan.aarch64 b/build.config.cuttlefish_kasan.aarch64
index 4e4fb6c..c81cffb 100644
--- a/build.config.cuttlefish_kasan.aarch64
+++ b/build.config.cuttlefish_kasan.aarch64
@@ -1,15 +1,12 @@
-. ${ROOT_DIR}/common/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
-. ${ROOT_DIR}/common/build.config.gki_kasan
+. ${ROOT_DIR}/cuttlefish-modules/build.config.cuttlefish
+
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan
 
-BUILD_INITRAMFS=1
-EXT_MODULES="cuttlefish-modules"
-LZ4_RAMDISK=1
 DEFCONFIG=cf_aarch_64_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}/cuttlefish-modules/cuttlefish.fragment"
-POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG} && update_kasan_config"
+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}/cuttlefish-modules/cuttlefish.fragment"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} && update_kasan_config"
 
-KERNEL_DIR=common
 function update_kasan_config() {
     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
          -e CONFIG_KASAN \
diff --git a/build.config.cuttlefish_kasan.x86_64 b/build.config.cuttlefish_kasan.x86_64
index 7634daa..02c94da 100644
--- a/build.config.cuttlefish_kasan.x86_64
+++ b/build.config.cuttlefish_kasan.x86_64
@@ -1,15 +1,12 @@
-. ${ROOT_DIR}/common/build.config.common
-. ${ROOT_DIR}/common/build.config.x86_64
-. ${ROOT_DIR}/common/build.config.gki_kasan
+. ${ROOT_DIR}/cuttlefish-modules/build.config.cuttlefish
+
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan
 
-BUILD_INITRAMFS=1
-EXT_MODULES="cuttlefish-modules"
-LZ4_RAMDISK=1
 DEFCONFIG=cf_x86_64_gki_defconfig
-PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/x86/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/x86/configs/gki_defconfig ${ROOT_DIR}/cuttlefish-modules/cuttlefish.fragment"
-POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/x86/configs/${DEFCONFIG} && update_kasan_config"
+PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/gki_defconfig ${ROOT_DIR}/cuttlefish-modules/cuttlefish.fragment"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG} && update_kasan_config"
 
-KERNEL_DIR=common
 function update_kasan_config() {
     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
          -e CONFIG_KASAN \