commit 820bc82bed78de3b3ed5946e78e01d95a99c6d67
author Alex Deymo <deymo@google.com> Wed Aug 10 05:04:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 10 05:04:23 2016 +0000
tree be300cae9e967209e728e53415e749a4c103ba25
parent 65b899a628568b5752683993a6924decc6555ddb
parent 93ff77ad1a7bf544bbd3591018edd46179c49d13

Merge changes from topic 'ab_sideload' am: 3750ed3e17
am: 93ff77ad1a

Change-Id: Idbe285c05dfb9b4b6252ef87a3066f8a41f13044

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index df09fb5..0fcfc46 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -760,6 +760,10 @@
 	$(hide) rm -f $@
 	$(hide) mkdir -p $(dir $@)
 	$(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
 

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 b11225c..3ab4a2c 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -255,6 +255,7 @@
     elif (OPTIONS.replace_ota_keys and
           info.filename in (
               "BOOT/RAMDISK/res/keys",
+              "BOOT/RAMDISK/etc/update_engine/update-payload-key.pub.pem",
               "RECOVERY/RAMDISK/res/keys",
               "SYSTEM/etc/security/otacerts.zip",
               "SYSTEM/etc/update_engine/update-payload-key.pub.pem")):
@@ -510,6 +511,10 @@
         output_tf_zip,
         "SYSTEM/etc/update_engine/update-payload-key.pub.pem",
         pubkey)
+    common.ZipWriteStr(
+        output_tf_zip,
+        "BOOT/RAMDISK/etc/update_engine/update-payload-key.pub.pem",
+        pubkey)
 
   return new_recovery_keys