Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c98ad6c authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Revert "releasetools: Use pattern filter when unzipping."" 

am: 0c3e31c6

Change-Id: Id85576e87048f8828b5c0bf8ab3b6ebcd118002a
parents 2b7a043a 0c3e31c6

tools/releasetools/check_target_files_signatures.py

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ class TargetFiles(object): 
    self.certmap = None



  def LoadZipFile(self, filename):

    d, z = common.UnzipTemp(filename, ['*.apk'])

    d, z = common.UnzipTemp(filename, '*.apk')

    try:

      self.apks = {}

      self.apks_by_basename = {}

tools/releasetools/common.py

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ def UnzipTemp(filename, pattern=None): 
  def unzip_to_dir(filename, dirname):

    cmd = ["unzip", "-o", "-q", filename, "-d", dirname]

    if pattern is not None:

      cmd.extend(pattern)

      cmd.append(pattern)

    p = Run(cmd, stdout=subprocess.PIPE)

    p.communicate()

    if p.returncode != 0:

tools/releasetools/ota_from_target_files.py

+2 −6
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ OPTIONS.payload_signer = None 
OPTIONS.payload_signer_args = []



METADATA_NAME = 'META-INF/com/android/metadata'

UNZIP_PATTERN = ['IMAGES/*', 'META/*', 'RADIO/*']





def MostPopularKey(d, default):

  """Given a dict, return the key corresponding to the largest
@@ -2216,8 +2214,7 @@ def main(argv): 
    OPTIONS.extra_script = open(OPTIONS.extra_script).read()



  print("unzipping target target-files...")

  OPTIONS.input_tmp, input_zip = common.UnzipTemp(

      args[0], UNZIP_PATTERN if OPTIONS.block_based else None)

  OPTIONS.input_tmp, input_zip = common.UnzipTemp(args[0])



  OPTIONS.target_tmp = OPTIONS.input_tmp

  OPTIONS.info_dict = common.LoadInfoDict(input_zip, OPTIONS.target_tmp)
@@ -2285,8 +2282,7 @@ def main(argv): 
  else:

    print("unzipping source target-files...")

    OPTIONS.source_tmp, source_zip = common.UnzipTemp(

        OPTIONS.incremental_source,

        UNZIP_PATTERN if OPTIONS.block_based else None)

        OPTIONS.incremental_source)

    OPTIONS.target_info_dict = OPTIONS.info_dict

    OPTIONS.source_info_dict = common.LoadInfoDict(source_zip,

                                                   OPTIONS.source_tmp)