commit 1796ffa3301f835db8a35f0ddc130b6bbac069f4
author Tao Bao <tbao@google.com> Mon Aug 27 18:07:56 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 27 18:07:56 2018 +0000
tree 09768dc4fe5761c714f2a63262a05514ba470f13
parent 9e913d0fcf1ac8db7995f1eb7a5e0f83b9f4ae56
parent 687da3b0a5388f1066def270189eaa07719c9a3b

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

tools/releasetools/sign_target_files_apks.py

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 5c6c8e1..cb0c268 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -597,8 +597,8 @@
   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"