Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d4808db authored by Doug Zongker's avatar Doug Zongker
Browse files

put extra recovery keys in the product definition 

Change-Id: I71637cd578b24891c10171aa59406848649be703
parent 4216a8c9

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -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 $@) .)

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 \

core/product_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -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)