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

Merge "Handle multiple APKs from the same package in check_target_files_signatures.py."

Browse Source
This commit is contained in:
Tao Bao
2016-07-28 04:28:38 +00:00
committed by Gerrit Code Review
parent b3389f4823 6a54299fbd
commit 653980bfe4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/check_target_files_signatures.py
View File

@@ -245,7 +245,7 @@ class TargetFiles(object):
fullname = os.path.join(dirpath, fn) fullname = os.path.join(dirpath, fn)
displayname = fullname[len(d)+1:] displayname = fullname[len(d)+1:]
apk = APK(fullname, displayname) apk = APK(fullname, displayname)
self.apks[apk.package] = apk self.apks[apk.filename] = apk
self.apks_by_basename[os.path.basename(apk.filename)] = apk self.apks_by_basename[os.path.basename(apk.filename)] = apk
self.max_pkg_len = max(self.max_pkg_len, len(apk.package)) self.max_pkg_len = max(self.max_pkg_len, len(apk.package))
@@ -316,8 +316,7 @@ class TargetFiles(object):
self.max_pkg_len, apk.package, self.max_pkg_len, apk.package,
apk.shared_uid) apk.shared_uid)
else: else:
print " %-*s %-*s" % (self.max_fn_len, apk.filename, print " %-*s %s" % (self.max_fn_len, apk.filename, apk.package)
self.max_pkg_len, apk.package)
print print
def CompareWith(self, other): def CompareWith(self, other):