Add Goldfish to soong name spaces of MGSI products
We need mk_combined_img in GF products to create mixed images.
Bug: 157212511
Test: $ lunch mgsi_arm-userdebug; m mk_combined_img
$ lunch mgsi_arm64-userdebug; m mk_combined_img
$ lunch mgsi_x86-userdebug; m mk_combined_img
$ lunch mgsi_x86_64-userdebug; m mk_combined_img
Change-Id: I62cafb087f4c918a5469e5ad76ee18f9fde42d4e
Merged-In: I62cafb087f4c918a5469e5ad76ee18f9fde42d4e
(cherry picked from commit ce6013b8c1d4acc0d1437e1ee4c043ec56d7e790)
diff --git a/mgsi/mgsi_arm.mk b/mgsi/mgsi_arm.mk
index 653bf09..5068311 100644
--- a/mgsi/mgsi_arm.mk
+++ b/mgsi/mgsi_arm.mk
@@ -35,6 +35,7 @@
# Don't build super.img.
PRODUCT_BUILD_SUPER_PARTITION := false
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
PRODUCT_NAME := mgsi_arm
PRODUCT_DEVICE := dummy_arm
diff --git a/mgsi/mgsi_arm64.mk b/mgsi/mgsi_arm64.mk
index 7353e63..89753f3 100644
--- a/mgsi/mgsi_arm64.mk
+++ b/mgsi/mgsi_arm64.mk
@@ -36,6 +36,7 @@
# Don't build super.img.
PRODUCT_BUILD_SUPER_PARTITION := false
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
PRODUCT_NAME := mgsi_arm64
PRODUCT_DEVICE := dummy_arm64
diff --git a/mgsi/mgsi_x86.mk b/mgsi/mgsi_x86.mk
index 38a8bb1..3a10aa5 100644
--- a/mgsi/mgsi_x86.mk
+++ b/mgsi/mgsi_x86.mk
@@ -35,6 +35,8 @@
# Don't build super.img.
PRODUCT_BUILD_SUPER_PARTITION := false
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
+
PRODUCT_NAME := mgsi_x86
PRODUCT_DEVICE := dummy_x86
PRODUCT_BRAND := Android
diff --git a/mgsi/mgsi_x86_64.mk b/mgsi/mgsi_x86_64.mk
index da8a36e..9a409ee 100644
--- a/mgsi/mgsi_x86_64.mk
+++ b/mgsi/mgsi_x86_64.mk
@@ -35,6 +35,7 @@
PRODUCT_BUILD_SUPER_PARTITION := false
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
PRODUCT_NAME := mgsi_x86_64
PRODUCT_DEVICE := dummy_x86_64
