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

Commit cd982eca authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '7969-s-signature' into 'v1-s' 

build: Use our keys for otacerts if it exists

See merge request !49
parents 72c96e2c d4e27687

target/product/security/Android.mk

+17 −4
Original line number Diff line number Diff line
@@ -63,8 +63,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



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 -symlinks=false -f $(PRIVATE_CERT)
@@ -82,11 +89,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 -symlinks=false \

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