diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 6 | ||||
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rw-r--r-- | core/product_config.mk | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 68905ac..02f1741 100644 --- a/core/Makefile +++ b/core/Makefile @@ -654,7 +654,7 @@ RECOVERY_INSTALL_OTA_KEYS := \ $(call intermediates-dir-for,PACKAGING,ota_keys)/keys DUMPKEY_JAR := $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar $(RECOVERY_INSTALL_OTA_KEYS): PRIVATE_OTA_PUBLIC_KEYS := $(OTA_PUBLIC_KEYS) -$(RECOVERY_INSTALL_OTA_KEYS): extra_keys := $(patsubst %,%.x509.pem,$(TARGET_EXTRA_RECOVERY_KEYS)) +$(RECOVERY_INSTALL_OTA_KEYS): extra_keys := $(patsubst %,%.x509.pem,$(PRODUCT_EXTRA_RECOVERY_KEYS)) $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) @echo "DumpPublicKey: $@ <= $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys)" @rm -rf $@ @@ -1068,8 +1068,8 @@ endif ifdef INTERNAL_USERIMAGES_SPARSE_EXT_FLAG $(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(zip_root)/META/misc_info.txt endif -ifdef TARGET_EXTRA_RECOVERY_KEYS - $(hide) echo "extra_recovery_keys=$(TARGET_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt +ifdef PRODUCT_EXTRA_RECOVERY_KEYS + $(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt endif @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) diff --git a/core/product.mk b/core/product.mk index 249582b..c2b398e 100644 --- a/core/product.mk +++ b/core/product.mk @@ -71,6 +71,7 @@ _product_var_list := \ PRODUCT_CHARACTERISTICS \ PRODUCT_COPY_FILES \ PRODUCT_OTA_PUBLIC_KEYS \ + PRODUCT_EXTRA_RECOVERY_KEYS \ PRODUCT_PACKAGE_OVERLAYS \ DEVICE_PACKAGE_OVERLAYS \ PRODUCT_CONTRIBUTORS_FILE \ diff --git a/core/product_config.mk b/core/product_config.mk index 433fae2..4f4f97d 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -303,6 +303,10 @@ ADDITIONAL_BUILD_PROPERTIES := \ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OTA_PUBLIC_KEYS)) +PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \ + $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS)) + + # --------------------------------------------------------------- # Simulator overrides ifeq ($(TARGET_PRODUCT),sim) |