PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ca261d3b48

Change-Id: I0278ded6acb4c003c65cb6b71b7b52a7824fe2fc
This commit is contained in:
Tao Bao
2017-01-20 20:22:13 +00:00
committed by android-build-merger
parent 87f49b83ca ca261d3b48
commit 6a82bc228a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/Android.mk
+9 -3
View File
@@ -35,7 +35,9 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \ libcrypto \
libbz \ libbz \
libz libz
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := \
-DZLIB_CONST \
-Werror
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# libimgpatch (static library) # libimgpatch (static library)
@@ -54,7 +56,9 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \ libcrypto \
libbz \ libbz \
libz libz
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := \
-DZLIB_CONST \
-Werror
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# libimgpatch (host static library) # libimgpatch (host static library)
@@ -74,7 +78,9 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \ libcrypto \
libbz \ libbz \
libz libz
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := \
-DZLIB_CONST \
-Werror
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
# libapplypatch_modes (static library) # libapplypatch_modes (static library)
applypatch/imgpatch.cpp
+1 -1
View File
@@ -160,7 +160,7 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value
strm.zfree = Z_NULL; strm.zfree = Z_NULL;
strm.opaque = Z_NULL; strm.opaque = Z_NULL;
strm.avail_in = src_len; 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.avail_out = expanded_len;
strm.next_out = expanded_source.data(); strm.next_out = expanded_source.data();