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

Commit 5dd0b8a9 authored by Justin Yun's avatar Justin Yun Committed by Automerger Merge Worker
Browse files

Merge "Remove ro.product.vndk.version property" into main am: b81aa10e am:... 

Merge "Remove ro.product.vndk.version property" into main am: b81aa10e am: c8651b78 am: e207017e

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



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

core/main.mk

+0 −13
Original line number Diff line number Diff line
@@ -335,19 +335,6 @@ ADDITIONAL_VENDOR_PROPERTIES += \ 
    ro.build.ab_update=$(AB_OTA_UPDATER)

endif



# Set ro.product.vndk.version to know the VNDK version required by product

# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value

# is "current", use PLATFORM_VNDK_VERSION.

ifdef PRODUCT_PRODUCT_VNDK_VERSION

ifeq ($(KEEP_VNDK),true)

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)



ifeq ($(AB_OTA_UPDATER),true)