Merge "Set ro.product.vndk.version for VNDK v35" into main
This commit is contained in:
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)
|
||||
|
Reference in New Issue
Block a user