tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4 am: bcb65cbfca am: cbc1f8abe3

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

Change-Id: I330c2423d3f130ab00e47e095a6ec6f33c4603cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Buynytskyy 2023-08-18 19:35:14 +00:00 committed by Automerger Merge Worker
commit 5f1a89be6e
1 changed files with 4 additions and 1 deletions
Show stats 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)
_vndk_versions :=
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
ifneq ($(BOARD_VNDK_VERSION),current)
_vndk_versions += $(BOARD_VNDK_VERSION)