From ce608ab7d24e4d6bfddb6550e884ba4b46aa2494 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Mon, 28 Dec 2015 23:51:19 +0800 Subject: Add zip and unzip when using toybox Change-Id: I75500bfe4e7adf66c5538597d79ed0539e7bb551 Signed-off-by: dianlujitao --- Android.mk | 6 ++++++ prebuilt/Android.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Android.mk b/Android.mk index 3bed65081..94084d8d8 100644 --- a/Android.mk +++ b/Android.mk @@ -369,6 +369,12 @@ else ifneq ($(wildcard external/toybox/Android.mk),) LOCAL_ADDITIONAL_DEPENDENCIES += toybox_symlinks endif + ifneq ($(wildcard external/zip/Android.mk),) + LOCAL_ADDITIONAL_DEPENDENCIES += zip + endif + ifneq ($(wildcard external/unzip/Android.mk),) + LOCAL_ADDITIONAL_DEPENDENCIES += unzip + endif endif ifneq ($(TW_NO_EXFAT), true) LOCAL_ADDITIONAL_DEPENDENCIES += mkexfatfs fsckexfat diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 4ea7e71c8..ea83286c1 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -20,6 +20,12 @@ else RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23)) RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/toybox + ifneq ($(wildcard external/zip/Android.mk),) + RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/zip + endif + ifneq ($(wildcard external/unzip/Android.mk),) + RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/unzip + endif endif endif RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/pigz -- cgit v1.2.3