Merge "Refactor the imgdiff" am: f411f3dcfb

am: 6c1a6c389b Change-Id: Ifc13d6c9fad007909f49192a8e34d37083c0a682
2017-08-03 18:29:25 +00:00
parent a09376ed90 6c1a6c389b
commit e500bc3e15
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