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

Commit 39a7a968 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix 'expected str instance, bytes found' error when compute patches" am: 5cf8eef2 

Original change: https://android-review.googlesource.com/c/platform/build/+/2298037



Change-Id: Icac2e62e086e40390f8dc8a04d6dbbba6c3ac0d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f209e686 5cf8eef2

tools/releasetools/blockimgdiff.py

+1 −1
Original line number Diff line number Diff line
@@ -1171,7 +1171,7 @@ class BlockImageDiff(object): 
          try:

            # Compresses with the default level

            compress_obj = zlib.compressobj(6, zlib.DEFLATED, -zlib.MAX_WBITS)

            compressed_data = (compress_obj.compress("".join(tgt_data))

            compressed_data = (compress_obj.compress(b"".join(tgt_data))

                               + compress_obj.flush())

            compressed_size = len(compressed_data)

          except zlib.error as e: