aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk15
-rw-r--r--recovery_cmds.h3
2 files changed, 17 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index ede6a96..f62b431 100644
--- a/Android.mk
+++ b/Android.mk
@@ -72,6 +72,7 @@ LOCAL_STATIC_LIBRARIES := \
libext4_utils_static \
libmake_ext4fs_static \
libminizip_static \
+ libminiunz_static \
libsparse_static \
libfsck_msdos \
libminipigz \
@@ -130,7 +131,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += toybox_recovery_links
# Set up the static symlinks
RECOVERY_TOOLS := \
- gunzip gzip make_ext4fs minizip reboot setup_adbd sh start stop toybox
+ gunzip gzip make_ext4fs reboot setup_adbd sh start stop toybox unzip zip
LOCAL_POST_INSTALL_CMD := \
$(hide) $(foreach t,$(RECOVERY_TOOLS),ln -sf recovery $(TARGET_RECOVERY_ROOT_OUT)/sbin/$(t);)
@@ -176,6 +177,18 @@ LOCAL_SRC_FILES := \
../../external/zlib/src/contrib/minizip/zip.c
include $(BUILD_STATIC_LIBRARY)
+# Miniunz static library
+include $(CLEAR_VARS)
+LOCAL_MODULE := libminiunz_static
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := -Dmain=miniunz_main -D__ANDROID__ -DIOAPI_NO_64
+LOCAL_C_INCLUDES := external/zlib
+LOCAL_SRC_FILES := \
+ ../../external/zlib/src/contrib/minizip/ioapi.c \
+ ../../external/zlib/src/contrib/minizip/miniunz.c \
+ ../../external/zlib/src/contrib/minizip/unzip.c
+include $(BUILD_STATIC_LIBRARY)
+
# Reboot static library
include $(CLEAR_VARS)
LOCAL_MODULE := libreboot_static
diff --git a/recovery_cmds.h b/recovery_cmds.h
index a420ae1..51bf57c 100644
--- a/recovery_cmds.h
+++ b/recovery_cmds.h
@@ -21,6 +21,7 @@
#include <string.h>
int minizip_main(int argc, char **argv);
+int miniunz_main(int argc, char **argv);
int make_ext4fs_main(int argc, char **argv);
int reboot_main(int argc, char **argv);
int poweroff_main(int argc, char **argv);
@@ -53,6 +54,8 @@ static const struct recovery_cmd recovery_cmds[] = {
{ "pigz", pigz_main },
{ "gzip", pigz_main },
{ "gunzip", pigz_main },
+ { "zip", minizip_main },
+ { "unzip", miniunz_main },
{ "start", start_main },
{ "stop", stop_main },
{ "sh", mksh_main },