Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main (a28e56e1) · Commits · e / os / android_build

core/main.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -220,11 +220,13 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system
		# property_overrides_split_enabled is true. Otherwise it will be installed in
		# /system/build.prop
		ifdef BOARD_VNDK_VERSION
		ifneq ($(KEEP_VNDK),false)
		ifeq ($(BOARD_VNDK_VERSION),current)
		ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)
		else
		ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)
		endif
		endif

		# 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.
		@@ -337,12 +339,14 @@ endif
		# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value
		# is "current", use PLATFORM_VNDK_VERSION.
		ifdef PRODUCT_PRODUCT_VNDK_VERSION
		ifneq ($(KEEP_VNDK),false)
		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
		endif

		ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)