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

Commit 37472997 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Do not set ro.(product.)vndk.version if VNDK is deprecated 

ro.(product.)vndk.version should be empty when the VNDK is deprecated.
This change skips property set up when KEEP_VNDK flag is false. Device
can check if VNDK is deprecated with ro.(product.)vndk.version property.

Bug: 290159430
Test: aosp_cf_x86_64_phone build and boot succeeded.
Change-Id: Ia02fb33137c8df456fda87b5b769cfb940349747
parent b531ccf3

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -213,11 +213,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.
@@ -330,12 +332,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)