From f19d840d13adafae5cdfbc298e5cc0620797902f Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Mon, 18 Nov 2019 19:43:41 +0900 Subject: [PATCH] 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/product.mk | 4 ++++ core/soong_config.mk | 1 + 2 files changed, 5 insertions(+) diff --git a/core/product.mk b/core/product.mk index c7aac000ca..55cbc5e51c 100644 --- a/core/product.mk +++ b/core/product.mk @@ -309,6 +309,10 @@ _product_single_value_vars += PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE # List of extra VNDK versions to be included _product_list_vars += PRODUCT_EXTRA_VNDK_VERSIONS +# VNDK version of product partition. It can be 'current' if the product +# partitions uses PLATFORM_VNDK_VERSION. +_product_single_value_var += PRODUCT_PRODUCT_VNDK_VERSION + # Whether the whitelist of actionable compatible properties should be disabled or not _product_single_value_vars += PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE diff --git a/core/soong_config.mk b/core/soong_config.mk index 85e7bbc9fb..7813e307a1 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -124,6 +124,7 @@ $(call add_json_bool, DevicePrefer32BitApps, $(filter true,$(TARGET_ $(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))