openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes from topic 'ab_sideload' 

* changes:
  Replace OTA sideload verification key when signing A/B devices.
  Install the update-payload-key in the recovery image as well.
This commit is contained in:
Alex Deymo 2016-08-10 03:55:24 +00:00 committed by Gerrit Code Review
parent a1374de305 b3e8ce6d1d
commit 3750ed3e17
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@ -776,6 +776,10 @@ $(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem: $(addsuffix .x509.pe
$(hide) rm -f $@ $(hide) rm -f $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) openssl x509 -pubkey -noout -in $< > $@ $(hide) openssl x509 -pubkey -noout -in $< > $@
ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_RECOVERY_ROOT_OUT)/etc/update_engine/update-payload-key.pub.pem
$(TARGET_RECOVERY_ROOT_OUT)/etc/update_engine/update-payload-key.pub.pem: $(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem
$(hide) cp -f $< $@
endif endif
endif endif

5
tools/releasetools/sign_target_files_apks.py
View File

@ -255,6 +255,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
elif (OPTIONS.replace_ota_keys and elif (OPTIONS.replace_ota_keys and
info.filename in ( info.filename in (
"BOOT/RAMDISK/res/keys", "BOOT/RAMDISK/res/keys",
"BOOT/RAMDISK/etc/update_engine/update-payload-key.pub.pem",
"RECOVERY/RAMDISK/res/keys", "RECOVERY/RAMDISK/res/keys",
"SYSTEM/etc/security/otacerts.zip", "SYSTEM/etc/security/otacerts.zip",
"SYSTEM/etc/update_engine/update-payload-key.pub.pem")): "SYSTEM/etc/update_engine/update-payload-key.pub.pem")):
@ -510,6 +511,10 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
output_tf_zip, output_tf_zip,
"SYSTEM/etc/update_engine/update-payload-key.pub.pem", "SYSTEM/etc/update_engine/update-payload-key.pub.pem",
pubkey) pubkey)
common.ZipWriteStr(
output_tf_zip,
"BOOT/RAMDISK/etc/update_engine/update-payload-key.pub.pem",
pubkey)
return new_recovery_keys return new_recovery_keys