StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow BOARD_USES_RECOVERY_AS_BOOT without BOARD_BUILD_SYSTEM_ROOT_IMAGE"

Browse Source
This commit is contained in:
Tom Cherry
2018-09-26 22:24:54 +00:00
committed by Gerrit Code Review
parent 004b9b7b7d 2929cadb3b
commit b6eeba5bab
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/sign_target_files_apks.py
View File

@@ -597,8 +597,7 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
if p.returncode != 0:
raise common.ExternalError("failed to run dumpkeys")
if (misc_info.get("system_root_image") == "true" and
misc_info.get("recovery_as_boot") == "true"):
if misc_info.get("recovery_as_boot") == "true":
recovery_keys_location = "BOOT/RAMDISK/res/keys"
else:
recovery_keys_location = "RECOVERY/RAMDISK/res/keys"