Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e am: 87f21f19f6

Original change: https://android-review.googlesource.com/c/platform/build/+/2648185

Change-Id: I24a52822c4ace63dc4a9795c4bdc5a2247cc050f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-19 06:12:41 +00:00
committed by Automerger Merge Worker
3 changed files with 11 additions and 0 deletions

View File

@@ -778,6 +778,9 @@ $(KATI_obsolete_var $(foreach req,$(requirements),$(req)_OVERRIDE) \
requirements :=
# Set default value of KEEP_VNDK.
KEEP_VNDK ?= true
# BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED can be true only if early-mount of
# partitions is supported. But the early-mount must be supported for full
# treble products, and so BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED should be set

View File

@@ -218,6 +218,12 @@ ifdef BOARD_VNDK_VERSION
else
ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)
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.
ifneq ($(KEEP_VNDK),true)
ADDITIONAL_SYSTEM_PROPERTIES += ro.vndk.deprecate=true
endif
endif
# Add cpu properties for bionic and ART.

View File

@@ -319,6 +319,8 @@ $(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))
$(call add_json_str, ReleaseVersion, $(_RELEASE_VERSION))
$(call add_json_list, ReleaseAconfigValueSets, $(RELEASE_ACONFIG_VALUE_SETS))
$(call add_json_bool, KeepVndk, $(filter true,$(KEEP_VNDK)))
$(call json_end)
$(file >$(SOONG_VARIABLES).tmp,$(json_contents))