From 7f42bef3a98fd56240f950693a3a6b4db4d9feaa Mon Sep 17 00:00:00 2001
From: John Moon <quic_johmoo@quicinc.com>
Date: Wed, 24 May 2023 20:05:19 -0700
Subject: [PATCH] ANDROID: bazel: Adding make_goals to consolidate build

With a recent upstream change, build.config MAKE_GOALS are no longer
respected. So, we must define our make goals via the kernel_build
rule.

Add make_rules to the consolidate build.

Bug: 284126265
Change-Id: I30a98807d47a2be50c681d154d1bd0360e8bfe34
Signed-off-by: John Moon <quic_johmoo@quicinc.com>
---
 consolidate.bzl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/consolidate.bzl b/consolidate.bzl
index f75d40b11c62..4e46a25d0eeb 100644
--- a/consolidate.bzl
+++ b/consolidate.bzl
@@ -43,6 +43,12 @@ def define_consolidate():
             "certs/signing_key.pem",
             "certs/signing_key.x509",
         ],
+        make_goals = [
+            "Image",
+            "modules",
+            "Image.lz4",
+            "Image.gz",
+        ],
         module_implicit_outs = COMMON_GKI_MODULES_LIST,
         build_config = rule_base + "_build_config",
     )