Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 239c5308 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Always include vendor_manifest.xml in PRODUCT_PACKAGES 

vendor_manifest.xml has been converted to bp, and will not generate any
build actions if DEVICE_MANIFEST_FILE does not exist.

Test: m soong_generated_vendor_filesystem_test
Bug: 374168094
Change-Id: I7541fe1c2c79d84afac881168b021cf27ff68972
parent 490590b7

core/main.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -986,7 +986,6 @@ define auto-included-modules 
  $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver)) \

  $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver)) \

  $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) \

  $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) \

  llndk.libraries.txt \

  llndk.libraries.txt \

  $(if $(DEVICE_MANIFEST_FILE),vendor_manifest.xml) \

  $(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \

  $(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \

  $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \

  $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \

  $(if $(ODM_MANIFEST_SKUS),$(foreach sku, $(ODM_MANIFEST_SKUS),odm_manifest_$(sku).xml)) \

  $(if $(ODM_MANIFEST_SKUS),$(foreach sku, $(ODM_MANIFEST_SKUS),odm_manifest_$(sku).xml)) \

target/product/base_vendor.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,7 @@ PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 += \ 
# VINTF data for vendor image

# VINTF data for vendor image

PRODUCT_PACKAGES += \

PRODUCT_PACKAGES += \

    vendor_compatibility_matrix.xml \

    vendor_compatibility_matrix.xml \

    vendor_manifest.xml \





# Base modules and settings for the debug ramdisk, which is then packed

# Base modules and settings for the debug ramdisk, which is then packed

# into a boot-debug.img and a vendor_boot-debug.img.

# into a boot-debug.img and a vendor_boot-debug.img.