aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Chen <ycchen@google.com>2021-12-24 14:47:04 +0800
committerIsaac Chen <ycchen@google.com>2021-12-24 14:47:04 +0800
commite25376e509c52c28d266d9fe8071b9f597d58c47 (patch)
treec8f19e0a666708fa56ad97bb795f47a2f10aaa53
parent52103ef144645ccaa98b0e69e775a80027dbcdf4 (diff)
downloadcommon-e25376e509c52c28d266d9fe8071b9f597d58c47.tar.gz
Let gsi_arm* products build mk_combined_img
mk_combined_img is in device/generic/goldfish name space. Bug: 211941819 Test: m mk_combined_img Change-Id: I61a5b436b955b8052afc0fa91ed9836e307c5c08
-rw-r--r--gsi_arm.mk2
-rw-r--r--gsi_arm64.mk2
2 files changed, 4 insertions, 0 deletions
diff --git a/gsi_arm.mk b/gsi_arm.mk
index 1a28cc8..869e852 100644
--- a/gsi_arm.mk
+++ b/gsi_arm.mk
@@ -44,6 +44,8 @@ $(call inherit-product, device/generic/common/gsi_product.mk)
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# Needed to build mk_combined_img used for creating mixed GSI/emu image
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
PRODUCT_NAME := gsi_arm
PRODUCT_DEVICE := generic
diff --git a/gsi_arm64.mk b/gsi_arm64.mk
index 53c8300..d1c10ff 100644
--- a/gsi_arm64.mk
+++ b/gsi_arm64.mk
@@ -50,6 +50,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# Needed to build mk_combined_img used for creating mixed GSI/emu image
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
PRODUCT_NAME := gsi_arm64
PRODUCT_DEVICE := generic_arm64