From 992ef6c6e02276bbbf6481f33eb8b3e65a6250e2 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Fri, 5 Jan 2018 18:35:06 +0900 Subject: [PATCH] Separate vndk_snapshot_package from vndk_package 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 --- target/product/core_minimal.mk | 1 + target/product/vndk/Android.mk | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index b252349ddb..16599cb95f 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -85,6 +85,7 @@ PRODUCT_PACKAGES += \ telephony-common \ uiautomator \ uncrypt \ + vndk_snapshot_package \ voip-common \ webview \ webview_zygote \ diff --git a/target/product/vndk/Android.mk b/target/product/vndk/Android.mk index a134d020b0..93aaf37982 100644 --- a/target/product/vndk/Android.mk +++ b/target/product/vndk/Android.mk @@ -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