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."

Browse Source
This commit is contained in:
Daniel Norman
2021-01-15 16:31:58 +00:00
committed by Gerrit Code Review
parent 7604390e4c c3d7fff348
commit fc596c996f
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 $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) 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) ifneq ($(BOARD_VNDK_VERSION),current)
_vndk_versions += $(BOARD_VNDK_VERSION) _vndk_versions += $(BOARD_VNDK_VERSION)
endif endif