commit 6a82bc228a1001990d7fe95e36f52c37125d93cf
author Tao Bao <tbao@google.com> Fri Jan 20 20:22:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 20:22:13 2017 +0000
tree 1ca0132abeffaf25ae8a780e5533ffde5050ba82
parent 87f49b83caa6b40ec8c8ae2a2e89c598ce6d233a
parent ca261d3b48ec38f30b4e7ed38b8a11b7a3f02df2

Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656
am: ca261d3b48

Change-Id: I0278ded6acb4c003c65cb6b71b7b52a7824fe2fc

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 85b5c9f..bdaef1b 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();