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

Separate vndk_snapshot_package from vndk_package

Browse Source 
vndk_package only includes current VNDK builds without snapshots.
The snapshots will be included by PRODUCT_EXTRA_VNDK_VERSIONS
regardless of vndk_package in PRODUCT_PACKAGES.

Bug: 71609233
Test: Generate snapshot files and include the version in
      PRODUCT_EXTRA_VNDK_VERSIONS. Check if snapshots are installed.

Change-Id: If788af2f7773dd50b8b9ceb1957b8e54fde9ca9f
This commit is contained in:
Justin Yun
2018-01-05 18:35:06 +09:00
parent 13f228ebde
commit 992ef6c6e0
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/product/core_minimal.mk
View File

@@ -85,6 +85,7 @@ PRODUCT_PACKAGES += \
telephony-common \ telephony-common \
uiautomator \ uiautomator \
uncrypt \ uncrypt \
vndk_snapshot_package \
voip-common \ voip-common \
webview \ webview \
webview_zygote \ webview_zygote \

13
target/product/vndk/Android.mk
View File

@@ -77,26 +77,19 @@ endif
@chmod a+x $@ @chmod a+x $@
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := vndk_current LOCAL_MODULE := vndk_package
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
$(LLNDK_LIBRARIES) \ $(LLNDK_LIBRARIES) \
llndk.libraries.txt \ llndk.libraries.txt \
vndksp.libraries.txt vndksp.libraries.txt
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := vndk_package LOCAL_MODULE := vndk_snapshot_package
ifeq (current,$(BOARD_VNDK_VERSION))
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
vndk_current
else
LOCAL_REQUIRED_MODULES := \
vndk_v$(BOARD_VNDK_VERSION)_$(TARGET_ARCH)
endif
LOCAL_REQUIRED_MODULES += \
$(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH)) $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH))
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
endif # BOARD_VNDK_VERSION is set endif # BOARD_VNDK_VERSION is set