commit f19d840d13adafae5cdfbc298e5cc0620797902f
author Justin Yun <justinyun@google.com> Mon Nov 18 19:43:41 2019 +0900
committer Justin Yun <justinyun@google.com> Sat Dec 21 00:49:09 2019 +0000
tree 22fc4702a19f13f7991fb50511083cd8bfa5cc77
parent b516ddd5398800fdcb920653f9393ba78ae35fc0

Define PRODUCT_PRODUCT_VNDK_VERSION

PRODUCT_PRODUCT_VNDK_VERSION sets the VNDK version for product
partition. It may have "current" to use the PLATFORM_VNDK_VERSION.
If PRODUCT_PRODUCT_VNDK_VERSION is set, the native modules in product
partition are enforced to use VNDK's only from the system partition
as BOARD_VNDK_VERSION did to vendor partition.

Bug: 144534640
Test: build
Change-Id: I7ea148f0f8b7e44be7810adcacb30702d66831f1

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 85e7bbc..7813e30 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -124,6 +124,7 @@
 $(call add_json_bool, DevicePrefer32BitExecutables,      $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)))
 $(call add_json_str,  DeviceVndkVersion,                 $(BOARD_VNDK_VERSION))
 $(call add_json_str,  Platform_vndk_version,             $(PLATFORM_VNDK_VERSION))
+$(call add_json_str,  ProductVndkVersion,                $(PRODUCT_PRODUCT_VNDK_VERSION))
 $(call add_json_list, ExtraVndkVersions,                 $(PRODUCT_EXTRA_VNDK_VERSIONS))
 $(call add_json_bool, BoardVndkRuntimeDisable,           $(BOARD_VNDK_RUNTIME_DISABLE))
 $(call add_json_list, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))