tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f am: 3efc0cd50c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8438550235a041ea52c9c886d526942ef4daf865
This commit is contained in:
Daniel Norman 2021-01-15 18:00:47 +00:00 committed by Automerger Merge Worker
commit 42ced0a63e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/product/gsi/Android.mk
View file

@ -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