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

Merge "Ignore invalid vndk snapshot versions" into main

Browse Source
This commit is contained in:
Alex Buynytskyy
2023-08-18 17:51:23 +00:00
committed by Gerrit Code Review
parent 9ef5b821a0 a5e5151af8
commit 4a35600b7f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
target/product/gsi/Android.mk
View File

@@ -195,7 +195,10 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
_vndk_versions := _vndk_versions :=
ifeq ($(filter com.android.vndk.current.on_vendor, $(PRODUCT_PACKAGES)),) ifeq ($(filter com.android.vndk.current.on_vendor, $(PRODUCT_PACKAGES)),)
_vndk_versions += $(PRODUCT_EXTRA_VNDK_VERSIONS) _vndk_versions += $(if $(call math_is_number,$(PLATFORM_VNDK_VERSION)),\
$(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),\
$(if $(call math_lt,$(vndk_ver),$(PLATFORM_VNDK_VERSION)),$(vndk_ver))),\
$(PRODUCT_EXTRA_VNDK_VERSIONS))
endif endif
ifneq ($(BOARD_VNDK_VERSION),current) ifneq ($(BOARD_VNDK_VERSION),current)
_vndk_versions += $(BOARD_VNDK_VERSION) _vndk_versions += $(BOARD_VNDK_VERSION)