tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix python3 incompatiable code" am: 7a048996b7 am: 4d6bc649e8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1886461

Change-Id: Ic2eb5b60a57989960712dc975a1eea66b3e988a3
This commit is contained in:
Tianjie Xu 2021-11-10 17:42:20 +00:00 committed by Automerger Merge Worker
commit bff0316e3c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/releasetools/target_files_diff.py
View file

@ -82,7 +82,7 @@ def rewrite_build_property(original, new):
skip = True
break
if not skip:
new.write(line)
new.write(line.encode())
def trim_install_recovery(original, new):
@ -91,7 +91,7 @@ def trim_install_recovery(original, new):
partition.
"""
for line in original:
new.write(re.sub(r'[0-9a-f]{40}', '0'*40, line))
new.write(re.sub(r'[0-9a-f]{40}', '0'*40, line).encode())
def sort_file(original, new):
"""
@ -101,7 +101,7 @@ def sort_file(original, new):
lines = original.readlines()
lines.sort()
for line in lines:
new.write(line)
new.write(line.encode())
# Map files to the functions that will modify them for diffing
REWRITE_RULES = {
@ -148,7 +148,7 @@ def diff(name, file1, file2, out_file):
if stdout == 'Binary files %s and %s differ' % (f1, f2):
print("%s: Binary files differ" % name, file=out_file)
else:
for line in stdout.strip().split('\n'):
for line in stdout.strip().split(b'\n'):
print("%s: %s" % (name, line), file=out_file)
def recursiveDiff(prefix, dir1, dir2, out_file):