Merge "Fix the detection for compressed APKs." into oc-mr1-dev

  certmap = {}

  compressed_extension = None

  # META/apkcerts.txt contains the info for _all_ the packages known at build

  # time. Filter out the ones that are not installed.

  installed_files = set()

  for name in tf_zip.namelist():

    basename = os.path.basename(name)

    if basename:

      installed_files.add(basename)

  for line in tf_zip.read("META/apkcerts.txt").split("\n"):

    line = line.strip()

    if not line:

      else:

        raise ValueError("failed to parse line from apkcerts.txt:\n" + line)

      if this_compressed_extension:

        # Only count the installed files.

        filename = name + '.' + this_compressed_extension

        if filename not in installed_files:

          continue

        # Make sure that all the values in the compression map have the same

        # extension. We don't support multiple compression methods in the same

        # system image.