Fix python3 incompatiable code

http://aosp/1883069 switch the releasetool to use python3.
But target_files_diff still have py2 code that cause failures.
Fix that to unblock OTA generation.

Bug: 205790608
Test: generate an incremental OTA
Change-Id: Ib4d86dc1842afeae8b35681c7d809da140fac600
This commit is contained in:
Tianjie
2021-11-09 23:37:11 -08:00
parent 984ad44276
commit b049191e78

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):