Merge "Attach apk_name as a suffix for the temporary files"

def SignApk(data, keyname, pw, platform_api_level, codename_to_api_level_map,

            is_compressed):

  unsigned = tempfile.NamedTemporaryFile()

            is_compressed, apk_name):

  unsigned = tempfile.NamedTemporaryFile(suffix='_' + apk_name)

  unsigned.write(data)

  unsigned.flush()

    unsigned.close()

    unsigned = uncompressed

  signed = tempfile.NamedTemporaryFile()

  signed = tempfile.NamedTemporaryFile(suffix='_' + apk_name)

  # For pre-N builds, don't upgrade to SHA-256 JAR signatures based on the APK's

  # minSdkVersion to avoid increasing incremental OTA update sizes. If an APK

      if key not in common.SPECIAL_CERT_STRINGS:

        print("    signing: %-*s (%s)" % (maxsize, name, key))

        signed_data = SignApk(data, key, key_passwords[key], platform_api_level,

                              codename_to_api_level_map, is_compressed)

                              codename_to_api_level_map, is_compressed, name)

        common.ZipWriteStr(output_tf_zip, out_info, signed_data)

      else:

        # an APK we're not supposed to sign.