From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 5 Apr 2021 23:11:12 -0400 Subject: [PATCH] Allow setting OTA public keys from environment variable Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7 --- core/Makefile | 6 +++--- core/product_config.mk | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 3fb424733d..6d313406d6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1033,9 +1033,9 @@ 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) +ifneq ($(OTA_KEY_OVERRIDE_DIR),) + OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem + PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra endif # Generate a file containing the keys that will be read by the diff --git a/core/product_config.mk b/core/product_config.mk index 7b440b1eff..f26ebb6d55 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -422,6 +422,11 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS)) +ifneq ($(OTA_KEY_OVERRIDE_DIR),) + PRODUCT_OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem + PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra +endif + PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)) PRODUCT_DEX_PREOPT_BOOT_FLAGS := \