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

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

Merge branch '2959-a14-samsung' into 'a14' 

build: Use our keys for otacerts if it exists

See merge request !60
parents 1aeef673 f95176bc

target/product/security/Android.mk

+16 −4
Original line number Diff line number Diff line
@@ -33,11 +33,17 @@ include $(BUILD_SYSTEM)/base_rules.mk 


extra_ota_keys := $(addsuffix .x509.pem,$(PRODUCT_EXTRA_OTA_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_OTA_KEYS := $(extra_ota_keys)

$(LOCAL_BUILT_MODULE): \

	    $(SOONG_ZIP) \

	    $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem \

	    $(DEFAULT_OTA_CERTIFICATE).x509.pem \

	    $(extra_ota_keys)

	$(SOONG_ZIP) -o $@ -j -symlinks=false \

	    $(addprefix -f ,$(PRIVATE_CERT) $(PRIVATE_EXTRA_OTA_KEYS))
@@ -58,11 +64,17 @@ include $(BUILD_SYSTEM)/base_rules.mk 


extra_recovery_keys := $(addsuffix .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 \

	    $(addprefix -f ,$(PRIVATE_CERT) $(PRIVATE_EXTRA_RECOVERY_KEYS))