Merge "Define ro.product.vndk.version"

am: e8139b905d

Change-Id: Id413c3c9749811583e843555d0904edfffecbf6d
This commit is contained in:
Justin Yun 2019-12-25 01:02:58 -08:00 committed by android-build-merger
commit a126b69335
1 changed files with 11 additions and 0 deletions

View File

@ -232,6 +232,17 @@ ADDITIONAL_BUILD_PROPERTIES += $(foreach s,$(SANITIZE_TARGET),ro.sanitize.$(s)=t
# mount system_other partition.
ADDITIONAL_DEFAULT_PROPERTIES += ro.postinstall.fstab.prefix=/system
# Set ro.product.vndk.version to know the VNDK version required by product
# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value
# is "current", use PLATFORM_VNDK_VERSION.
ifdef PRODUCT_PRODUCT_VNDK_VERSION
ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current)
ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION)
else
ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PRODUCT_PRODUCT_VNDK_VERSION)
endif
endif
# -----------------------------------------------------------------
###
### In this section we set up the things that are different