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

Commit 888580e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b28 am: 87f21f19 

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



Change-Id: I24a52822c4ace63dc4a9795c4bdc5a2247cc050f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de6b4abf 87f21f19

core/config.mk

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

core/main.mk

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

core/soong_config.mk

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