tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Separate vndk_snapshot_package from vndk_package"

Browse source 
am: 866cdf8c07

Change-Id: Ia941ca2c96904552b9b2c8ab9936d49cec347b65
This commit is contained in:
Justin Yun 2018-01-19 04:15:33 +00:00 committed by android-build-merger
commit e0b06020f8
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 \ 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