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

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

Merge "Do not compare KEEP_VNDK with false" into main am: 65aa4c84 am: 230d729b 

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



Change-Id: If02c45e01cab1d810642447655d8d9d1d1f1eda7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38de8300 230d729b

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 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 ($(KEEP_VNDK),true)

  ifeq ($(BOARD_VNDK_VERSION),current)

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

  else
@@ -339,7 +339,7 @@ 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 ($(KEEP_VNDK),true)

ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current)

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

else