commit c0ca21af321e22974804d7cd9c63ffdeb335671c
author Roman Kiryanov <rkir@google.com> Tue Aug 09 04:39:07 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 09 04:39:07 2022 +0000
tree ffb5342e0638b21044b4fcdeaebf3b8dbe35585a
parent 5f403d31d25706f295246406ea3e0fed75d153c9
parent 0f4a0e753a4fd4476f7c3bc1890a940f23c9ccf4

Merge "Support derived target update of device manifest"

fvp.mk

diff --git a/fvp.mk b/fvp.mk
index 888d9f0..75ddabd 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -113,7 +113,7 @@
 # It's almost always faster to dexopt on the host even in eng builds.
 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
 
-DEVICE_MANIFEST_FILE := device/generic/goldfish/fvpbase/manifest.xml
+DEVICE_MANIFEST_FILE += device/generic/goldfish/fvpbase/manifest.xml
 
 # Use a multilib setup (see fvpbase/BoardConfig.mk).
 FVP_MULTILIB_BUILD := true

vendor.mk

diff --git a/vendor.mk b/vendor.mk
index a6a842c..fdbb77e 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -29,7 +29,7 @@
 
 DISABLE_RILD_OEM_HOOK := true
 
-DEVICE_MANIFEST_FILE := device/generic/goldfish/manifest.xml
+DEVICE_MANIFEST_FILE += device/generic/goldfish/manifest.xml
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera