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

Commit 85645a71 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'remotes/goog/donut' into donut-release

parents da8262ff 70a76816

tools/applypatch/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ifneq ($(TARGET_SIMULATOR),true) 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES := applypatch.c bsdiff.c freecache.c imgpatch.c

LOCAL_SRC_FILES := applypatch.c bsdiff.c freecache.c imgpatch.c utils.c

LOCAL_MODULE := libapplypatch

LOCAL_MODULE_TAGS := eng

LOCAL_C_INCLUDES += external/bzip2 external/zlib bootable/recovery
@@ -39,7 +39,7 @@ include $(BUILD_EXECUTABLE) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES := imgdiff.c

LOCAL_SRC_FILES := imgdiff.c utils.c

LOCAL_MODULE := imgdiff

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_TAGS := eng

tools/applypatch/applypatch.c

+3 −2
Original line number Diff line number Diff line
@@ -765,7 +765,8 @@ int applypatch(int argc, char** argv) { 
      return result;

    }

  } else if (header_bytes_read >= 8 &&

             memcmp(header, "IMGDIFF1", 8) == 0) {

             memcmp(header, "IMGDIFF", 7) == 0 &&

             (header[7] == '1' || header[7] == '2')) {

    int result = ApplyImagePatch(source_to_use->data, source_to_use->size,

                                 patch_filename, output, &ctx);

    if (result != 0) {
@@ -773,7 +774,7 @@ int applypatch(int argc, char** argv) { 
      return result;

    }

  } else {

    fprintf(stderr, "Unknown patch file format");

    fprintf(stderr, "Unknown patch file format\n");

    return 1;

  }