commit 4da58605f9ee084cdc8744a86d18884df77b494e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 11 01:39:36 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 11 01:39:36 2024 +0000
tree 97dbf144dbf70c4aa0bca7680c40e9b71f84eb42
parent 8226b6d7c24bfdb05faaff465f6821a3e4e700ec
parent b8c82d1c1b647aa256717d8ea89a5f60754a94aa

Merge cherrypicks of ['android-review.googlesource.com/2902208'] into 24Q1-release.

Change-Id: I1d31a5255f2d47e9fdd425274da8ef46cbd24702

vintfdata/Android.mk

diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 52a99ba..9af19ec 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -57,7 +57,13 @@
 
 GEN := $(local-generated-sources-dir)/compatibility_matrix.xml
 
+# VNDK is no longer a dependency for vendor version 35 and beyond
+$(GEN): PRIVATE_VINTF_VNDK_VERSION :=
+ifeq ($(call math_is_number,$(VINTF_VNDK_VERSION)),true)
+ifeq ($(call math_lt_or_eq,$(VINTF_VNDK_VERSION),34),true)
 $(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
+endif
+endif
 $(GEN): PRIVATE_DEVICE_MATRIX_INPUT_FILE := $(DEVICE_MATRIX_INPUT_FILE)
 $(GEN): $(DEVICE_MATRIX_INPUT_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
 	REQUIRED_VNDK_VERSION=$(PRIVATE_VINTF_VNDK_VERSION) \