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

Commit 36671434 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents dfb457c8 239c5308

core/main.mk

+0 −1
Original line number 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)) \

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

  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

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 += \ 
# 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.