openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29"

This commit is contained in:
Treehugger Robot 2020-02-07 01:46:41 +00:00 committed by Gerrit Code Review
parent 1fc958b4fe f3cd49787a
commit 562d15a67d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/product_config.mk
View File

@ -335,6 +335,12 @@ ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),)
endif endif
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, # If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS,
# override PRODUCT_EXTRA_VNDK_VERSIONS with it. # override PRODUCT_EXTRA_VNDK_VERSIONS with it.
ifdef OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS ifdef OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS

5
target/product/base_vendor.mk
View File

@ -41,7 +41,6 @@ PRODUCT_HOST_PACKAGES += \
# Base modules and settings for the vendor partition. # Base modules and settings for the vendor partition.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.cas@1.1-service \ android.hardware.cas@1.1-service \
android.hardware.configstore@1.1-service \
android.hardware.media.omx@1.0-service \ android.hardware.media.omx@1.0-service \
boringssl_self_test_vendor \ boringssl_self_test_vendor \
dumpsys_vendor \ dumpsys_vendor \
@ -70,6 +69,10 @@ PRODUCT_PACKAGES += \
vndservice \ vndservice \
vndservicemanager \ 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 # VINTF data for vendor image
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
vendor_compatibility_matrix.xml \ vendor_compatibility_matrix.xml \