Merge "Define ro.product.vndk.version" am: e8139b905d am: a126b69335 (4bce5b4f) · Commits · e / os / android_build

core/main.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,17 @@ endif
		# 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