commit 4410c0348ced5776e5203310c191f8ef3680d9a0
author Chris Phoenix <cphoenix@google.com> Mon Jan 23 20:27:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 23 20:27:50 2017 +0000
tree baa54fc4cda2a21f2c5e29ca811edb982e7aef22
parent f21b6c0d1df62fac6af2226a8ef7046738e21446
parent 0f93a11c9a35a8fd51746bbc986a026de151e473

Merge "bootctrl HAL uses "default" service name"

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();