StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix check_tf failure when duplicate package names are present" am: 4a376986ea am: 6a7d589ed2 am: 68b0980e5b am: 367d28b2c6

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

Change-Id: I232a775698ab70b0bf0cddeee9af55cb8af2652e
This commit is contained in:
Kelvin Zhang
2022-01-18 19:31:51 +00:00
committed by Automerger Merge Worker
parent e2b5582b7f 367d28b2c6
commit 988f92d7c5
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/releasetools/check_target_files_signatures.py
View File

@@ -65,10 +65,13 @@ logger = logging.getLogger(__name__)
# extra field anyway). # extra field anyway).
# Issue #14315: https://bugs.python.org/issue14315, fixed in Python 2.7.8 and # Issue #14315: https://bugs.python.org/issue14315, fixed in Python 2.7.8 and
# Python 3.5.0 alpha 1. # Python 3.5.0 alpha 1.
class MyZipInfo(zipfile.ZipInfo): class MyZipInfo(zipfile.ZipInfo):
def _decodeExtra(self): def _decodeExtra(self):
pass pass
zipfile.ZipInfo = MyZipInfo zipfile.ZipInfo = MyZipInfo
@@ -83,6 +86,7 @@ PROBLEM_PREFIX = []
def AddProblem(msg): def AddProblem(msg):
logger.error(msg)
PROBLEMS.append(" ".join(PROBLEM_PREFIX) + " " + msg) PROBLEMS.append(" ".join(PROBLEM_PREFIX) + " " + msg)
@@ -266,7 +270,7 @@ class APK(object):
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
manifest, err = p.communicate() manifest, err = p.communicate()
if err: if err:
AddProblem("failed to read manifest") AddProblem("failed to read manifest " + full_filename)
return return
self.shared_uid = None self.shared_uid = None
@@ -279,15 +283,15 @@ class APK(object):
name = m.group(1) name = m.group(1)
if name == "android:sharedUserId": if name == "android:sharedUserId":
if self.shared_uid is not None: if self.shared_uid is not None:
AddProblem("multiple sharedUserId declarations") AddProblem("multiple sharedUserId declarations " + full_filename)
self.shared_uid = m.group(2) self.shared_uid = m.group(2)
elif name == "package": elif name == "package":
if self.package is not None: if self.package is not None:
AddProblem("multiple package declarations") AddProblem("multiple package declarations " + full_filename)
self.package = m.group(2) self.package = m.group(2)
if self.package is None: if self.package is None:
AddProblem("no package declaration") AddProblem("no package declaration " + full_filename)
class TargetFiles(object): class TargetFiles(object):
@@ -400,7 +404,12 @@ class TargetFiles(object):
for _, digest in order: for _, digest in order:
print("%s:" % (ALL_CERTS.Get(digest),)) print("%s:" % (ALL_CERTS.Get(digest),))
apks = by_digest[digest] apks = by_digest[digest]
apks.sort() apks.sort(key=lambda x: x[0])
for i in range(1, len(apks)):
pkgname, apk = apks[i]
if pkgname == apks[i-1][0]:
print("Both {} and {} have same package name {}",
apk.filename, apks[i-1][1].filename, pkgname)
for _, apk in apks: for _, apk in apks:
if apk.shared_uid: if apk.shared_uid:
print(" %-*s %-*s [%s]" % (self.max_fn_len, apk.filename, print(" %-*s %-*s [%s]" % (self.max_fn_len, apk.filename,
@@ -527,8 +536,5 @@ if __name__ == '__main__':
try: try:
r = main(sys.argv[1:]) r = main(sys.argv[1:])
sys.exit(r) sys.exit(r)
except common.ExternalError as e:
print("\n ERROR: %s\n" % (e,))
sys.exit(1)
finally: finally:
common.Cleanup() common.Cleanup()