Merge b447397bc743437d4e27d5c98b3ee52243bc7fc9 on remote branch
Change-Id: I7a2c27c2b4ed82f6d6df2b0a591aa5542d5bb338
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_release.mk b/mgsi/mgsi_release.mk
index 9169d29..f697b8a 100644
--- a/mgsi/mgsi_release.mk
+++ b/mgsi/mgsi_release.mk
@@ -25,7 +25,7 @@
#
# Exclude all files under system/product and system/system_ext
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/product/% \
system/system_ext/%
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