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

Commit 8b132fe6 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊 Committed by Jackeagle
Browse files

build: Use our keys for otacerts if it exists 



Signed-off-by: default avatarJackeagle <jackeagle102@gmail.com>
parent 8f6ea5bf

target/product/security/Android.mk

+16 −5
Original line number Diff line number Diff line
@@ -55,10 +55,15 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_MODULE_STEM := otacerts.zip

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem

$(LOCAL_BUILT_MODULE): $(SOONG_ZIP) $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem

	$(SOONG_ZIP) -o $@ -j -f $(PRIVATE_CERT)

ifneq (,$(wildcard user-keys/releasekey.x509.pem))

DEFAULT_OTA_CERTIFICATE := user-keys/releasekey

else

DEFAULT_OTA_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)

endif



$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_OTA_CERTIFICATE).x509.pem

$(LOCAL_BUILT_MODULE): $(SOONG_ZIP) $(DEFAULT_OTA_CERTIFICATE).x509.pem

	$(SOONG_ZIP) -o $@ -j -f $(PRIVATE_CERT)



#######################################

# otacerts for recovery image.
@@ -72,11 +77,17 @@ include $(BUILD_SYSTEM)/base_rules.mk 


extra_recovery_keys := $(patsubst %,%.x509.pem,$(PRODUCT_EXTRA_RECOVERY_KEYS))



$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem

ifneq (,$(wildcard user-keys/releasekey.x509.pem))

DEFAULT_OTA_CERTIFICATE := user-keys/releasekey

else

DEFAULT_OTA_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)

endif



$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_OTA_CERTIFICATE).x509.pem

$(LOCAL_BUILT_MODULE): PRIVATE_EXTRA_RECOVERY_KEYS := $(extra_recovery_keys)

$(LOCAL_BUILT_MODULE): \

	    $(SOONG_ZIP) \

	    $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem \

	    $(DEFAULT_OTA_CERTIFICATE).x509.pem \

	    $(extra_recovery_keys)

	$(SOONG_ZIP) -o $@ -j \

	    $(foreach key_file, $(PRIVATE_CERT) $(PRIVATE_EXTRA_RECOVERY_KEYS), -f $(key_file))