StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not compare KEEP_VNDK with false" into main am: 65aa4c8429

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

Change-Id: I1ca24eec0a4d6544d5e65a6d4c2f38bf6e483adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim
2023-09-26 06:49:47 +00:00
committed by Automerger Merge Worker
parent 6ec1c0e15d 65aa4c8429
commit 230d729bec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -220,7 +220,7 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system
# property_overrides_split_enabled is true. Otherwise it will be installed in # property_overrides_split_enabled is true. Otherwise it will be installed in
# /system/build.prop # /system/build.prop
ifdef BOARD_VNDK_VERSION ifdef BOARD_VNDK_VERSION
ifneq ($(KEEP_VNDK),false) ifeq ($(KEEP_VNDK),true)
ifeq ($(BOARD_VNDK_VERSION),current) ifeq ($(BOARD_VNDK_VERSION),current)
ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION) ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)
else else
@@ -339,7 +339,7 @@ endif
# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value # modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value
# is "current", use PLATFORM_VNDK_VERSION. # is "current", use PLATFORM_VNDK_VERSION.
ifdef PRODUCT_PRODUCT_VNDK_VERSION ifdef PRODUCT_PRODUCT_VNDK_VERSION
ifneq ($(KEEP_VNDK),false) ifeq ($(KEEP_VNDK),true)
ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current) ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current)
ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION) ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION)
else else