From c3d7fff34890002c35b7d3e37107ce8e5f09b30c Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Thu, 14 Jan 2021 12:18:30 -0800 Subject: [PATCH] Stops including extra VNDK apexes if the VNDK current apex is on vendor. This is needed for merged mixed-release builds where the vendor half on release N contains VNDK current (vN) on /vendor. This change prevents the system half on release N+k from placing another copy of VNDK vN on /system_ext. Test: Build and merge crosshatch with S system and R vendor, boot Bug: 176993126 Change-Id: I5322931244e060b2e7c92d9578e5eb64b098d1d6 --- target/product/gsi/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index b4df5fef97..f21fe1691e 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -161,7 +161,10 @@ endif include $(BUILD_PHONY_PACKAGE) include $(CLEAR_VARS) -_vndk_versions := $(PRODUCT_EXTRA_VNDK_VERSIONS) +_vndk_versions := +ifeq ($(filter com.android.vndk.current.on_vendor, $(PRODUCT_PACKAGES)),) + _vndk_versions += $(PRODUCT_EXTRA_VNDK_VERSIONS) +endif ifneq ($(BOARD_VNDK_VERSION),current) _vndk_versions += $(BOARD_VNDK_VERSION) endif