commit 4a35600b7fd72a3bee8903c37ff78ce0ecaa3664
author Alex Buynytskyy <alexbuy@google.com> Fri Aug 18 17:51:23 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 18 17:51:23 2023 +0000
tree 829410c72f6b0230cbf69eb5ed6d96df99546ded
parent 9ef5b821a0af2539878d8469c8e8751a1f81edcb
parent a5e5151af8bb769d155d7863d56656100026d69d

Merge "Ignore invalid vndk snapshot versions" into main

target/product/gsi/Android.mk

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 86d4622..adeb159 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -195,7 +195,10 @@
 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)