summaryrefslogtreecommitdiffstats
path: root/applypatch
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-01-19 19:46:39 +0100
committerTao Bao <tbao@google.com>2017-01-20 21:13:28 +0100
commit087bc0c7d380fafc41bcc76610bff17f433cecd2 (patch)
tree11b68c50cab21509e5f404c570f7db77b9934274 /applypatch
parentMerge "minui: Export minui/minui.h." (diff)
downloadandroid_bootable_recovery-087bc0c7d380fafc41bcc76610bff17f433cecd2.tar
android_bootable_recovery-087bc0c7d380fafc41bcc76610bff17f433cecd2.tar.gz
android_bootable_recovery-087bc0c7d380fafc41bcc76610bff17f433cecd2.tar.bz2
android_bootable_recovery-087bc0c7d380fafc41bcc76610bff17f433cecd2.tar.lz
android_bootable_recovery-087bc0c7d380fafc41bcc76610bff17f433cecd2.tar.xz
android_bootable_recovery-087bc0c7d380fafc41bcc76610bff17f433cecd2.tar.zst
android_bootable_recovery-087bc0c7d380fafc41bcc76610bff17f433cecd2.zip
Diffstat (limited to '')
-rw-r--r--applypatch/Android.mk12
-rw-r--r--applypatch/imgpatch.cpp2
2 files changed, 10 insertions, 4 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index ec3c6ee38..3c88d1f58 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -35,7 +35,9 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \
libbz \
libz
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := \
+ -DZLIB_CONST \
+ -Werror
include $(BUILD_STATIC_LIBRARY)
# libimgpatch (static library)
@@ -54,7 +56,9 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \
libbz \
libz
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := \
+ -DZLIB_CONST \
+ -Werror
include $(BUILD_STATIC_LIBRARY)
# libimgpatch (host static library)
@@ -74,7 +78,9 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \
libbz \
libz
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := \
+ -DZLIB_CONST \
+ -Werror
include $(BUILD_HOST_STATIC_LIBRARY)
# libapplypatch_modes (static library)
diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp
index ae6071f0e..00ea90efa 100644
--- a/applypatch/imgpatch.cpp
+++ b/applypatch/imgpatch.cpp
@@ -160,7 +160,7 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value
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();