commit bee3580753090a80780114522e3c2a41fc7b49f0
author Ulises Mendez Martinez <umendez@google.com> Thu May 04 22:04:29 2023 +0000
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 10 17:05:32 2023 +0000
tree b4e60f2954815218e36cbd0dfcb42616f837fb65
parent ad4cc91ca603e8555e838632e2a2dea3e9afed8d

ANDROID: GKI: Remove MAKE_GOALS from build.config

* Instead use the equivalent kernel_build attribute.

Bug: 236012223
Change-Id: Id90fa89dcadd95d8a8ecf570f46d9d71a925c388
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
(cherry picked from commit ab7e63ef765d74b388e881800ad500c5f93199fc)

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 11bd5ca..bf55e22 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -19,6 +19,18 @@
     ],
 )
 
+_GKI_AARCH64_MAKE_GOALS = [
+    "Image",
+    "Image.lz4",
+    "Image.gz",
+    "modules",
+]
+
+_GKI_X86_64_MAKE_GOALS = [
+    "bzImage",
+    "modules",
+]
+
 filegroup(
     name = "aarch64_additional_kmi_symbol_lists",
     srcs = [
@@ -43,10 +55,12 @@
         "additional_kmi_symbol_lists": [":aarch64_additional_kmi_symbol_lists"],
         "protected_exports_list": "android/abi_gki_protected_exports_aarch64",
         "protected_modules_list": "android/gki_aarch64_protected_modules",
+        "make_goals": _GKI_AARCH64_MAKE_GOALS,
     },
     "kernel_aarch64_16k": {
         "kmi_symbol_list_strict_mode": False,
         "module_implicit_outs": COMMON_GKI_MODULES_LIST,
+        "make_goals": _GKI_AARCH64_MAKE_GOALS,
     },
     "kernel_aarch64_debug": {
         "kmi_symbol_list_strict_mode": False,
@@ -55,18 +69,21 @@
         "additional_kmi_symbol_lists": [":aarch64_additional_kmi_symbol_lists"],
         "protected_exports_list": "android/abi_gki_protected_exports_aarch64",
         "protected_modules_list": "android/gki_aarch64_protected_modules",
+        "make_goals": _GKI_AARCH64_MAKE_GOALS,
     },
     "kernel_x86_64": {
         "kmi_symbol_list_strict_mode": False,
         "module_implicit_outs": COMMON_GKI_MODULES_LIST,
         "protected_exports_list": "android/abi_gki_protected_exports_x86_64",
         "protected_modules_list": "android/gki_x86_64_protected_modules",
+        "make_goals": _GKI_X86_64_MAKE_GOALS,
     },
     "kernel_x86_64_debug": {
         "kmi_symbol_list_strict_mode": False,
         "module_implicit_outs": COMMON_GKI_MODULES_LIST,
         "protected_exports_list": "android/abi_gki_protected_exports_x86_64",
         "protected_modules_list": "android/gki_x86_64_protected_modules",
+        "make_goals": _GKI_X86_64_MAKE_GOALS,
     },
 })