Revert "Always include vendor_manifest.xml in PRODUCT_PACKAGES"
This reverts commit 239c5308eb03ac8490ce4e66b62ad9fec3999874.
Reason for revert: This breaks targets that use _only_
DEVICE_MANIFEST_SKUS and DEVICE_MANIFEST_<SKU>_FILES,
since vendor_manifest.xml is non existent on those targets.
The original change assumed it would be possible to add an entry
to PRODUCT_PACKAGES even if not existing, but that's not the case.
In the soong-only case this may work as we'd simply skip the
module installation via m.SkipInstall(), but when generating
Android.mk, as vintf_data does, that's not possible.
Test: m on qualcomm device which only contains SKU specific manifests
Change-Id: I3e4e8f9087640608643cc726bcfa0658467745eb
diff --git a/core/main.mk b/core/main.mk
index b9edfc1..eeacf4f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -993,6 +993,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)) \
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.