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

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

Merge "releasetools: Write back default_system_dev_certificate." 

am: ff87a9f9

Change-Id: I6fad2f4997eefbfc80d35ffb44775473f894a0d2
parents 95f4a845 ff87a9f9

tools/releasetools/sign_target_files_apks.py

+5 −3
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info): 
  except KeyError:

    raise common.ExternalError("can't read META/otakeys.txt from input")



  extra_recovery_keys = misc_info.get("extra_recovery_keys", None)

  extra_recovery_keys = misc_info.get("extra_recovery_keys")

  if extra_recovery_keys:

    extra_recovery_keys = [OPTIONS.key_map.get(k, k) + ".x509.pem"

                           for k in extra_recovery_keys.split()]
@@ -426,8 +426,10 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info): 
  else:

    devkey = misc_info.get("default_system_dev_certificate",

                           "build/target/product/security/testkey")

    mapped_keys.append(

        OPTIONS.key_map.get(devkey, devkey) + ".x509.pem")

    mapped_devkey = OPTIONS.key_map.get(devkey, devkey)

    if mapped_devkey != devkey:

      misc_info["default_system_dev_certificate"] = mapped_devkey

    mapped_keys.append(mapped_devkey + ".x509.pem")

    print("META/otakeys.txt has no keys; using %s for OTA package"

          " verification." % (mapped_keys[0],))