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

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

Merge "Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29"

parents 1fc958b4 f3cd4978

core/product_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -335,6 +335,12 @@ ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),) 
  endif

endif



ifdef PRODUCT_SHIPPING_API_LEVEL

  ifneq (,$(call math_gt_or_eq,29,$(PRODUCT_SHIPPING_API_LEVEL)))

    PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29)

  endif

endif



# If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS,

# override PRODUCT_EXTRA_VNDK_VERSIONS with it.

ifdef OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS

target/product/base_vendor.mk

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ PRODUCT_HOST_PACKAGES += \ 
# Base modules and settings for the vendor partition.

PRODUCT_PACKAGES += \

    android.hardware.cas@1.1-service \

    android.hardware.configstore@1.1-service \

    android.hardware.media.omx@1.0-service \

    boringssl_self_test_vendor \

    dumpsys_vendor \
@@ -70,6 +69,10 @@ PRODUCT_PACKAGES += \ 
    vndservice \

    vndservicemanager \



# Base module when shipping api level is less than or equal to 29

PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 += \

    android.hardware.configstore@1.1-service \



# VINTF data for vendor image

PRODUCT_PACKAGES += \

    vendor_compatibility_matrix.xml \