From 968581968c52b6cfa3d0bae0f195bb9237a80bd8 Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Tue, 9 Jan 2024 09:25:38 +0000 Subject: Do not create vendor-ndk in DCM for version 35+ VNDK is moved to /vendor in version 35 and beyond. This CL removes such a dependency from DCM. Bug: 310761012#comment17 Bug: 316829758 Test: check DCM Change-Id: Iad13bd7c440b8e5f190d4586d6b48d669ff735d5 --- vintfdata/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) 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 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/vintf 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) \ -- cgit v1.2.3