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

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

Browse Source 
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
This commit is contained in:
Daniel Norman
2021-01-14 12:18:30 -08:00
parent d041e4babf
commit c3d7fff348
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