commit 087bc0c7d380fafc41bcc76610bff17f433cecd2
author Tao Bao <tbao@google.com> Thu Jan 19 10:46:39 2017 -0800
committer Tao Bao <tbao@google.com> Fri Jan 20 12:13:28 2017 -0800
tree 11b68c50cab21509e5f404c570f7db77b9934274
parent 13d15af08fe0e916f998929f84209aa1cecfd0b5

imgpatch: Compile with ZLIB_CONST defined.

So z_stream.next_in takes pointer to const data.

Test: mmma bootable/recovery/applypatch
Change-Id: If269b766a7c84fa2f67424ee61ba5afab0159261

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index ec3c6ee..3c88d1f 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -35,7 +35,9 @@
     libcrypto \
     libbz \
     libz
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := \
+    -DZLIB_CONST \
+    -Werror
 include $(BUILD_STATIC_LIBRARY)
 
 # libimgpatch (static library)
@@ -54,7 +56,9 @@
     libcrypto \
     libbz \
     libz
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := \
+    -DZLIB_CONST \
+    -Werror
 include $(BUILD_STATIC_LIBRARY)
 
 # libimgpatch (host static library)
@@ -74,7 +78,9 @@
     libcrypto \
     libbz \
     libz
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := \
+    -DZLIB_CONST \
+    -Werror
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # libapplypatch_modes (static library)

applypatch/imgpatch.cpp

diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp
index ae6071f..00ea90e 100644
--- a/applypatch/imgpatch.cpp
+++ b/applypatch/imgpatch.cpp
@@ -160,7 +160,7 @@
         strm.zfree = Z_NULL;
         strm.opaque = Z_NULL;
         strm.avail_in = src_len;
-        strm.next_in = const_cast<unsigned char*>(old_data + src_start);
+        strm.next_in = old_data + src_start;
         strm.avail_out = expanded_len;
         strm.next_out = expanded_source.data();