StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675

Change-Id: I12f97e2b16d285350618843e640bf5762eb6fdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Yun
2023-11-05 08:00:15 +00:00
committed by Automerger Merge Worker
parent 14a06f4c68 2071b4eac2
commit 7094ed249f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/main.mk
View File

@@ -335,6 +335,18 @@ ADDITIONAL_VENDOR_PROPERTIES += \
ro.build.ab_update=$(AB_OTA_UPDATER) ro.build.ab_update=$(AB_OTA_UPDATER)
endif 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) ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)