StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2936a38f877bcb4107262019c18f57cb8ea7e85a
This commit is contained in:
Daniel Norman
2021-01-15 17:22:38 +00:00
committed by Automerger Merge Worker
parent 80140ebb26 fc596c996f
commit 3efc0cd50c
1 changed files with 4 additions and 1 deletions
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