diff options
| author | Isaac Chen <ycchen@google.com> | 2020-06-01 17:27:08 +0800 |
|---|---|---|
| committer | Isaac Chen <ycchen@google.com> | 2020-06-03 14:26:49 +0800 |
| commit | afaf70cd53d298e2f4bfdad41fef038c9d6f7c47 (patch) | |
| tree | 1af112740ea8467359b7647701d58840054382cd | |
| parent | cc61b88880b8812fc9dab4c26c0dadb8b051f1e1 (diff) | |
| download | common-afaf70cd53d298e2f4bfdad41fef038c9d6f7c47.tar.gz | |
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)
| -rw-r--r-- | mgsi/mgsi_arm.mk | 1 | ||||
| -rw-r--r-- | mgsi/mgsi_arm64.mk | 1 | ||||
| -rw-r--r-- | mgsi/mgsi_x86.mk | 2 | ||||
| -rw-r--r-- | mgsi/mgsi_x86_64.mk | 1 |
4 files changed, 5 insertions, 0 deletions
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 @@ $(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) # 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 @@ $(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) # 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 @@ $(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) # 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 @@ $(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) PRODUCT_BUILD_SUPER_PARTITION := false +PRODUCT_SOONG_NAMESPACES += device/generic/goldfish PRODUCT_NAME := mgsi_x86_64 PRODUCT_DEVICE := dummy_x86_64 |