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

Do not compare KEEP_VNDK with false

Browse Source 
Overall android build system assumes empty value as false, so comparing
KEEP_VNDK value with false can cause unexpected problem in the future.
It should be changed to compare with true in opposite way.

Bug: 299197187
Test: aosp_cf build succeeded with KEEP_VNDK=false
Change-Id: I5db685c2735309a14ea6bdb8b8928b2aa987929f
This commit is contained in:
Kiyoung Kim
2023-09-25 16:25:20 +09:00
parent 50b8e4fb0d
commit 29445bd935
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