From 943d0dd4cfb6aa79ee60a9a71b2cc30e1a90e0c7 Mon Sep 17 00:00:00 2001
From: Ulises Mendez Martinez <umendez@google.com>
Date: Thu, 27 Apr 2023 17:07:17 +0000
Subject: [PATCH] ANDROID: Unnest MAKE_GOALS from build configs

* This is in preparation for migrating these
as `kernel_build` attributes. i.e. these will
be removed as a follow-up.

Bug: 236012223
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:ccc4fb8185b50958354d8d511823491030988131)
Merged-In: I168c44fd76f9f2732caf8f5c00bec4ed8c96ee65
Change-Id: I168c44fd76f9f2732caf8f5c00bec4ed8c96ee65
---
 build.config.amlogic     | 6 +++++-
 build.config.gki.aarch64 | 4 +++-
 build.config.gki.riscv64 | 4 +++-
 build.config.rockpi4     | 4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/build.config.amlogic b/build.config.amlogic
index e04bd524936e..97bae1b728ad 100644
--- a/build.config.amlogic
+++ b/build.config.amlogic
@@ -9,7 +9,11 @@ POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG
 # needed for DT overlay support
 DTC_FLAGS="-@"
 
-MAKE_GOALS="${MAKE_GOALS}
+MAKE_GOALS="
+Image
+modules
+Image.lz4
+Image.gz
 dtbs
 "
 
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 709af184d7aa..c8d642c09f49 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -2,7 +2,9 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 
-MAKE_GOALS="${MAKE_GOALS}
+MAKE_GOALS="
+Image
+modules
 Image.lz4
 Image.gz
 "
diff --git a/build.config.gki.riscv64 b/build.config.gki.riscv64
index 8215d16e95ba..c110e1dce3c3 100644
--- a/build.config.gki.riscv64
+++ b/build.config.gki.riscv64
@@ -2,7 +2,9 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.riscv64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 
-MAKE_GOALS="${MAKE_GOALS}
+MAKE_GOALS="
+Image
+modules
 Image.lz4
 Image.gz
 "
diff --git a/build.config.rockpi4 b/build.config.rockpi4
index c9c9776dbb33..2d469f5ae9cc 100644
--- a/build.config.rockpi4
+++ b/build.config.rockpi4
@@ -12,7 +12,9 @@ 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="${MAKE_GOALS}
+MAKE_GOALS="
+Image
+modules
 rk3399-rock-pi-4b.dtb
 "