Merge "Refactor the imgdiff"

am: f411f3dcfb Change-Id: I2b99c2f0f0c117451db80324670590f96fbbb1da
2017-08-03 18:24:08 +00:00
parent fbd4b10310 f411f3dcfb
commit 6c1a6c389b
2 changed files with 616 additions and 440 deletions
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -127,7 +127,8 @@ libimgdiff_src_files := imgdiff.cpp
 # libbsdiff is compiled with -D_FILE_OFFSET_BITS=64.
 libimgdiff_cflags := \
    -Werror \
-    -D_FILE_OFFSET_BITS=64
+    -D_FILE_OFFSET_BITS=64 \
+    -DZLIB_CONST

 libimgdiff_static_libraries := \
    libbsdiff \
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp