openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revert "releasetools: check_target_files_signatures.py checks APEXes."" am: a0debcb62f 

am: a08464f59d

Change-Id: I498168bff3173cd62df92771335f58a3bc1d6ad0
This commit is contained in:
Tao Bao 2019-03-19 13:47:39 -07:00 committed by android-build-merger
parent 74475f02e7 a08464f59d
commit b06dc4ea54
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/check_target_files_signatures.py
View File

@ -168,7 +168,6 @@ def CertFromPKCS7(data, filename):
class APK(object): class APK(object):
def __init__(self, full_filename, filename): def __init__(self, full_filename, filename):
self.filename = filename self.filename = filename
self.certs = None self.certs = None
@ -245,12 +244,12 @@ class TargetFiles(object):
# must decompress them individually before we perform any analysis. # must decompress them individually before we perform any analysis.
# This is the list of wildcards of files we extract from |filename|. # This is the list of wildcards of files we extract from |filename|.
apk_extensions = ['*.apk', '*.apex'] apk_extensions = ['*.apk']
self.certmap, compressed_extension = common.ReadApkCerts( self.certmap, compressed_extension = common.ReadApkCerts(
zipfile.ZipFile(filename)) zipfile.ZipFile(filename, "r"))
if compressed_extension: if compressed_extension:
apk_extensions.append('*.apk' + compressed_extension) apk_extensions.append("*.apk" + compressed_extension)
d = common.UnzipTemp(filename, apk_extensions) d = common.UnzipTemp(filename, apk_extensions)
self.apks = {} self.apks = {}
@ -273,7 +272,7 @@ class TargetFiles(object):
os.remove(os.path.join(dirpath, fn)) os.remove(os.path.join(dirpath, fn))
fn = uncompressed_fn fn = uncompressed_fn
if fn.endswith(('.apk', '.apex')): if fn.endswith(".apk"):
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)