commit d7f30f67f818253594b3ffde333050e38b20b040
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 15 15:02:18 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Jun 15 15:02:18 2020 -0700
tree 1af112740ea8467359b7647701d58840054382cd
parent c8bdf472d78c27add7f25ce8260911883c32bb96
parent 4269cc2e23fee98c79b15de88b238159a2cb2ca9

Merge 4269cc2e23fee98c79b15de88b238159a2cb2ca9 on remote branch

Change-Id: I239817566851a5534461145ab840513d82182082

mgsi/csi_arm64.mk

diff --git a/mgsi/csi_arm64.mk b/mgsi/csi_arm64.mk
index ac0cb12..cbe69f6 100644
--- a/mgsi/csi_arm64.mk
+++ b/mgsi/csi_arm64.mk
@@ -49,6 +49,8 @@
 # Add RRO needed by CSI
 PRODUCT_PACKAGE_OVERLAYS := device/generic/common/mgsi/overlay
 
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
+
 PRODUCT_NAME := csi_arm64
 PRODUCT_DEVICE := dummy_arm64
 PRODUCT_BRAND := Android

mgsi/csi_x86.mk

diff --git a/mgsi/csi_x86.mk b/mgsi/csi_x86.mk
index 070f4dd..a041f14 100644
--- a/mgsi/csi_x86.mk
+++ b/mgsi/csi_x86.mk
@@ -48,6 +48,8 @@
 # Add RRO needed by CSI
 PRODUCT_PACKAGE_OVERLAYS := device/generic/common/mgsi/overlay
 
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
+
 PRODUCT_NAME := csi_x86
 PRODUCT_DEVICE := dummy_x86
 PRODUCT_BRAND := Android

mgsi/mgsi_arm.mk

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

mgsi/mgsi_arm64.mk

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

mgsi/mgsi_x86.mk

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

mgsi/mgsi_x86_64.mk

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