summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@gmail.com>2015-12-28 16:51:19 +0100
committerEthan Yonker <dees_troy@teamw.in>2016-01-22 18:30:22 +0100
commitce608ab7d24e4d6bfddb6550e884ba4b46aa2494 (patch)
tree2f73a8a80001284f8cea91d49d120660ba7c54ad
parentImprove max brightness handling (diff)
downloadandroid_bootable_recovery-ce608ab7d24e4d6bfddb6550e884ba4b46aa2494.tar
android_bootable_recovery-ce608ab7d24e4d6bfddb6550e884ba4b46aa2494.tar.gz
android_bootable_recovery-ce608ab7d24e4d6bfddb6550e884ba4b46aa2494.tar.bz2
android_bootable_recovery-ce608ab7d24e4d6bfddb6550e884ba4b46aa2494.tar.lz
android_bootable_recovery-ce608ab7d24e4d6bfddb6550e884ba4b46aa2494.tar.xz
android_bootable_recovery-ce608ab7d24e4d6bfddb6550e884ba4b46aa2494.tar.zst
android_bootable_recovery-ce608ab7d24e4d6bfddb6550e884ba4b46aa2494.zip
-rw-r--r--Android.mk6
-rw-r--r--prebuilt/Android.mk6
2 files changed, 12 insertions, 0 deletions
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