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

Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main

Browse Source
This commit is contained in:
Kiyoung Kim
2023-09-04 08:09:56 +00:00
committed by Gerrit Code Review
parent 5da26c0ab3 3747299783
commit a28e56e1cc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -220,11 +220,13 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system
# property_overrides_split_enabled is true. Otherwise it will be installed in # property_overrides_split_enabled is true. Otherwise it will be installed in
# /system/build.prop # /system/build.prop
ifdef BOARD_VNDK_VERSION ifdef BOARD_VNDK_VERSION
ifneq ($(KEEP_VNDK),false)
ifeq ($(BOARD_VNDK_VERSION),current) ifeq ($(BOARD_VNDK_VERSION),current)
ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION) ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)
else else
ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION) ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)
endif endif
endif
# TODO(b/290159430): ro.vndk.deprecate is a temporal variable for deprecating VNDK. # TODO(b/290159430): ro.vndk.deprecate is a temporal variable for deprecating VNDK.
# This variable will be removed once ro.vndk.version can be removed. # This variable will be removed once ro.vndk.version can be removed.
@@ -337,12 +339,14 @@ endif
# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value # modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value
# is "current", use PLATFORM_VNDK_VERSION. # is "current", use PLATFORM_VNDK_VERSION.
ifdef PRODUCT_PRODUCT_VNDK_VERSION ifdef PRODUCT_PRODUCT_VNDK_VERSION
ifneq ($(KEEP_VNDK),false)
ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current) ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current)
ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION) ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION)
else else
ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PRODUCT_PRODUCT_VNDK_VERSION) ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PRODUCT_PRODUCT_VNDK_VERSION)
endif endif
endif endif
endif
ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS) ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)