Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e78ca376 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "imgpatch: Compile with ZLIB_CONST defined."

parents 37bda6a0 087bc0c7

applypatch/Android.mk

+9 −3
Original line number Diff line number Diff line
@@ -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)

applypatch/imgpatch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();