From f3cd49787a29305e89522f104b2608acbbcba3de Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Tue, 14 Jan 2020 19:57:51 +0900 Subject: [PATCH] Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 The PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 is added. This value is base module when shipping api level is less than or equal to 29. Bug: 124531214 Test: m -j Change-Id: I0f06b04cf4c824b9c975d9b84f4a0e8171acef75 Merged-In: I0f06b04cf4c824b9c975d9b84f4a0e8171acef75 (cherry picked from commit a18f974bd765ce02ae92e552de5b3677edbfbeba) --- core/product_config.mk | 6 ++++++ target/product/base_vendor.mk | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/product_config.mk b/core/product_config.mk index afe91d47f0..0f84f3c2ef 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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 diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index c49aab7c2f..ccb90c8ba6 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -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 += \ device_compatibility_matrix.xml \