diff options
| author | Tao Bao <tbao@google.com> | 2017-01-20 21:15:57 +0100 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-20 21:15:57 +0100 |
| commit | e78ca37656d72d10952727c20f20c5044b4b3db0 (patch) | |
| tree | b2e5db48135124c31b3f4aa8ad4c274a3e0255f5 | |
| parent | Merge "imgdiff: cache bsdiff suffix array in zip mode." (diff) | |
| parent | imgpatch: Compile with ZLIB_CONST defined. (diff) | |
| download | android_bootable_recovery-e78ca37656d72d10952727c20f20c5044b4b3db0.tar android_bootable_recovery-e78ca37656d72d10952727c20f20c5044b4b3db0.tar.gz android_bootable_recovery-e78ca37656d72d10952727c20f20c5044b4b3db0.tar.bz2 android_bootable_recovery-e78ca37656d72d10952727c20f20c5044b4b3db0.tar.lz android_bootable_recovery-e78ca37656d72d10952727c20f20c5044b4b3db0.tar.xz android_bootable_recovery-e78ca37656d72d10952727c20f20c5044b4b3db0.tar.zst android_bootable_recovery-e78ca37656d72d10952727c20f20c5044b4b3db0.zip | |
| -rw-r--r-- | applypatch/Android.mk | 12 | ||||
| -rw-r--r-- | applypatch/imgpatch.cpp | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 85b5c9fcd..bdaef1b27 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(); |