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

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

Merge "releasetools: Fix the path to the OTA keys in recovery image." am: 1796ffa3

am: 9f034f7e

Change-Id: I31dc021da3f4e639259081269002a369bb5bcf2f
parents c5b88c06 9f034f7e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -597,8 +597,8 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
  if p.returncode != 0:
    raise common.ExternalError("failed to run dumpkeys")

  # system_root_image puts the recovery keys at BOOT/RAMDISK.
  if misc_info.get("system_root_image") == "true":
  if (misc_info.get("system_root_image") == "true" and
      misc_info.get("recovery_as_boot") == "true"):
    recovery_keys_location = "BOOT/RAMDISK/res/keys"
  else:
    recovery_keys_location = "RECOVERY/RAMDISK/res/keys"