Set ro.product.vndk.version for VNDK v35
Until we have updated art mainline module, we must provide ro.product.vndk.version to use product namespace for product apks. This can be removed when art mainline module is updated. Bug: 308676119 Test: See if product apps uses product-clns namespace in cf_x86_64_phone-next-userdebug Change-Id: I5030fb0f82c80e0cb94c89179e6c71df119368da
This commit is contained in:
parent
8b1d74ec60
commit
925d1f517c
1 changed files with 12 additions and 0 deletions
12
core/main.mk
12
core/main.mk
|
@ -335,6 +335,18 @@ ADDITIONAL_VENDOR_PROPERTIES += \
|
|||
ro.build.ab_update=$(AB_OTA_UPDATER)
|
||||
endif
|
||||
|
||||
# Set ro.product.vndk.version to PLATFORM_VNDK_VERSION only if
|
||||
# KEEP_VNDK is true, PRODUCT_PRODUCT_VNDK_VERSION is current and
|
||||
# PLATFORM_VNDK_VERSION is less than or equal to 35.
|
||||
# ro.product.vndk.version must be removed for the other future builds.
|
||||
ifeq ($(KEEP_VNDK)|$(PRODUCT_PRODUCT_VNDK_VERSION),true|current)
|
||||
ifeq ($(call math_is_number,$(PLATFORM_VNDK_VERSION)),true)
|
||||
ifeq ($(call math_lt_or_eq,$(PLATFORM_VNDK_VERSION),35),true)
|
||||
ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)
|
||||
|
||||
ifeq ($(AB_OTA_UPDATER),true)
|
||||
|
|
Loading…
Reference in a new issue