commit 7101b2e2854985727b7ef65e5b5057e0ecf2d034
author Tao Bao <tbao@google.com> Wed Jun 03 10:49:29 2015 -0700
committer Rom Lemarchand <romlem@google.com> Mon Nov 16 14:28:40 2015 -0800
tree 937f286110e485837d6a50203c7ab362a4f7afdd
parent cde720797f55ca3ca1bfc82b7b928447c37e7656

recovery: Switch to clang

And a few trival fixes to suppress warnings.

Change-Id: Id28e3581aaca4bda59826afa80c0c1cdfb0442fc
(cherry picked from commit 80e46e08de5f65702fa7f7cd3ef83f905d919bbc)

minzip/Android.mk

diff --git a/minzip/Android.mk b/minzip/Android.mk
index 045f355..48d26bc 100644
--- a/minzip/Android.mk
+++ b/minzip/Android.mk
@@ -16,6 +16,8 @@
 
 LOCAL_MODULE := libminzip
 
+LOCAL_CLANG := true
+
 LOCAL_CFLAGS += -Wall
 
 include $(BUILD_STATIC_LIBRARY)

minzip/Zip.c

diff --git a/minzip/Zip.c b/minzip/Zip.c
index 40712e0..a64c833 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -506,7 +506,6 @@
     void *cookie)
 {
     long result = -1;
-    unsigned char readBuf[32 * 1024];
     unsigned char procBuf[32 * 1024];
     z_stream zstream;
     int zerr;
@@ -603,7 +602,6 @@
     void *cookie)
 {
     bool ret = false;
-    off_t oldOff;
 
     switch (pEntry->compression) {
     case STORED: