Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc596c99 authored by Daniel Norman's avatar Daniel Norman Committed by Gerrit Code Review
Browse files

Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor."

parents 7604390e c3d7fff3

target/product/gsi/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -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