Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a1a0a82 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Define PRODUCT_PRODUCT_VNDK_VERSION" 

am: 1ad03c71

Change-Id: I1256cd471e05c53449866730332b20ed44ede782
parents b1dd6eb6 1ad03c71

core/product.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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))