commit c660cee7d3d74a79049ff790bc68e00a544e5de1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 13 10:01:41 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 13 10:01:41 2025 -0700
tree 766c4a13bec121ad3a031333867d19fc1eaa8e2d
parent 175a521c95242924849e0baf335f3b6d9f85ed38
parent fc74734795b60ef1bc732919abeae2f358e2d8a2

Merge "Revert "Always include vendor_manifest.xml in PRODUCT_PACKAGES"" into main

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 86d8d82..aed3fa2 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -995,6 +995,7 @@
 define auto-included-modules
   $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver)) \
   llndk.libraries.txt \
+  $(if $(DEVICE_MANIFEST_FILE),vendor_manifest.xml) \
   $(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \
   $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \
   $(if $(ODM_MANIFEST_SKUS),$(foreach sku, $(ODM_MANIFEST_SKUS),odm_manifest_$(sku).xml)) \

target/product/base_vendor.mk

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 16fc7fd..b4e450e 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -106,7 +106,6 @@
 # VINTF data for vendor image
 PRODUCT_PACKAGES += \
     vendor_compatibility_matrix.xml \
-    vendor_manifest.xml \
 
 # Base modules and settings for the debug ramdisk, which is then packed
 # into a boot-debug.img and a vendor_boot-debug.img.