p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Separate vndk_snapshot_package from vndk_package" am: 866cdf8c07 am: e0b06020f8 

am: cdb7eff6d0

Change-Id: Ide315b923e3b965604002019c050d2f3a0ac931b
This commit is contained in:
Justin Yun 2018-01-19 04:51:46 +00:00 committed by android-build-merger
parent 96e73cd33d cdb7eff6d0
commit a406dbcc13
2 changed files with 4 additions and 10 deletions
Show Stats 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 \
uiautomator \
uncrypt \
vndk_snapshot_package \
voip-common \
webview \
webview_zygote \

13
target/product/vndk/Android.mk
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