From 81509f85f33a71f3db8a63ac585155a785febe83 Mon Sep 17 00:00:00 2001
From: Ulises Mendez Martinez <umendez@google.com>
Date: Fri, 12 May 2023 12:04:53 +0000
Subject: [PATCH] ANDROID: db845c: Remove MAKE_GOALS from build.config

* Instead use the equivalent kernel_build attribute.
* This migrates rockpi4 `MAKE_GOALS` too.

Bug: 236012223
Change-Id: Icf47eb42795100b4955f02170a002689c7566194
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
---
 BUILD.bazel          | 11 +++++++++++
 build.config.db845c  |  7 -------
 build.config.rockpi4 |  5 -----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 5b25f970f3a1..ff684be5f6e9 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -104,6 +104,12 @@ define_db845c(
     ],
     define_abi_targets = True,
     kmi_symbol_list = "//common:android/abi_gki_aarch64_db845c",
+    make_goals = [
+        "modules",
+        "qcom/sdm845-db845c.dtb",
+        "qcom/qrb5165-rb5.dtb",
+        "qcom/sm8450-qrd.dtb",
+    ],
     module_outs = [
         # keep sorted
         "crypto/michael_mic.ko",
@@ -307,6 +313,11 @@ kernel_build(
     ],
     build_config = "build.config.rockpi4",
     dtstree = "//common-modules/virtual-device:rockpi4_dts",
+    make_goals = [
+        "Image",
+        "modules",
+        "rk3399-rock-pi-4b.dtb",
+    ],
     module_outs = COMMON_GKI_MODULES_LIST + [
         # keep sorted
         "drivers/block/virtio_blk.ko",
diff --git a/build.config.db845c b/build.config.db845c
index 9e1c48e9f39e..8ad7ae362abc 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -7,13 +7,6 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/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}/${FRAGMENT_CONFIG}"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
-MAKE_GOALS="
-modules
-qcom/sdm845-db845c.dtb
-qcom/qrb5165-rb5.dtb
-qcom/sm8450-qrd.dtb
-"
-
 FILES="
 arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
diff --git a/build.config.rockpi4 b/build.config.rockpi4
index 2d469f5ae9cc..15c10c39f41e 100644
--- a/build.config.rockpi4
+++ b/build.config.rockpi4
@@ -12,11 +12,6 @@ POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG
 
 DTS_EXT_DIR=common-modules/virtual-device
 DTC_INCLUDE=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/boot/dts/rockchip
-MAKE_GOALS="
-Image
-modules
-rk3399-rock-pi-4b.dtb
-"
 
 FILES="${FILES}
 ../common-modules/virtual-device/rk3399-rock-pi-4b.dtb