From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 5 Apr 2021 23:03:18 -0400 Subject: [PATCH] Allow setting OTA public keys from environment variable Change-Id: Ie7edd059b8d701d5ec0d0d922e23d034f69e579f --- core/Makefile | 4 ++++ core/product_config.mk | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/core/Makefile b/core/Makefile index f2a524d58c..92c7928d35 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1217,6 +1217,10 @@ endif # substitute other keys for this one. OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem +ifneq ($(OTA_KEY_OVERRIDE_DIR),) + OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem +endif + # Generate a file containing the keys that will be read by the # recovery binary. RECOVERY_INSTALL_OTA_KEYS := \ diff --git a/core/product_config.mk b/core/product_config.mk index bcab7a384c..401d270542 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -404,6 +404,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 := \