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

Commit e68edc80 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1 

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



Change-Id: I3968b8e6773bb60cb8ef064af931536177eaa019
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d56c052f a28e56e1

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -220,11 +220,13 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system 
# property_overrides_split_enabled is true. Otherwise it will be installed in

# /system/build.prop

ifdef BOARD_VNDK_VERSION

  ifneq ($(KEEP_VNDK),false)

  ifeq ($(BOARD_VNDK_VERSION),current)

    ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)

  else

    ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)

  endif

  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.
@@ -337,12 +339,14 @@ endif 
# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value

# is "current", use PLATFORM_VNDK_VERSION.

ifdef PRODUCT_PRODUCT_VNDK_VERSION

ifneq ($(KEEP_VNDK),false)

ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current)

ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION)

else

ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PRODUCT_PRODUCT_VNDK_VERSION)

endif

endif

endif



ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)