summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-07-01 23:35:26 +0100
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 16:12:20 -0700
commita5c679664c03dcf05a4808388b9d335f1ea8fc39 (patch)
tree8c9e26e6254e6d6ce12bb5c9faf5359a9d4440a8 /core
parenta5dd6cea72ff36ce145f10a32d84122f0ea8ba29 (diff)
downloadbuild-a5c679664c03dcf05a4808388b9d335f1ea8fc39.zip
build-a5c679664c03dcf05a4808388b9d335f1ea8fc39.tar.gz
build-a5c679664c03dcf05a4808388b9d335f1ea8fc39.tar.bz2
Sign final packages with a different key if requested
...and throw it into recovery builds as well Change-Id: Ic96d4d49d821cb03d5318e3e9ad93d02fb92573e
Diffstat (limited to 'core')
-rw-r--r--core/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index 63586ac..fa5fec7 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -389,6 +389,9 @@ endif
# exist with the suffixes ".x509.pem" and ".pk8".
DEFAULT_KEY_CERT_PAIR := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
+ifneq ($(OTA_PACKAGE_SIGNING_KEY),)
+ DEFAULT_KEY_CERT_PAIR := $(OTA_PACKAGE_SIGNING_KEY)
+endif
# Rules that need to be present for the all targets, even
# if they don't do anything.
@@ -864,6 +867,11 @@ endif
# substitute other keys for this one.
OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
+ifneq ($(OTA_PACKAGE_SIGNING_KEY),)
+ OTA_PUBLIC_KEYS := $(OTA_PACKAGE_SIGNING_KEY).x509.pem
+ PRODUCT_EXTRA_RECOVERY_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
+endif
+
# Generate a file containing the keys that will be read by the
# recovery binary.
RECOVERY_INSTALL_OTA_KEYS := \