Merge "Separate vndk_snapshot_package from vndk_package"

This commit is contained in:
Treehugger Robot 2018-01-19 03:06:34 +00:00 committed by Gerrit Code Review
commit 866cdf8c07
2 changed files with 4 additions and 10 deletions

View file

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

View file

@ -77,26 +77,19 @@ endif
@chmod a+x $@
include $(CLEAR_VARS)
LOCAL_MODULE := vndk_current
LOCAL_MODULE := vndk_package
LOCAL_REQUIRED_MODULES := \
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
$(LLNDK_LIBRARIES) \
llndk.libraries.txt \
vndksp.libraries.txt
include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS)
LOCAL_MODULE := vndk_package
ifeq (current,$(BOARD_VNDK_VERSION))
LOCAL_MODULE := vndk_snapshot_package
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))
include $(BUILD_PHONY_PACKAGE)
endif # BOARD_VNDK_VERSION is set