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

Commit cec578c9 authored by Alex Deymo's avatar Alex Deymo
Browse files

Don't include the dev-key on IOT products. 

This patch updates the logic to use the PRODUCT_IOT variable instead of
BRILLO.

Bug: 36702887
Test: `make`; Image doesn't have the dev key.
Change-Id: I1751e97d8cdfeba83c7e4720a017a5f4dcfd49da
parent 35eaf52e

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -759,11 +759,11 @@ $(TARGET_OUT_ETC)/security/otacerts.zip: $(addsuffix .x509.pem,$(DEFAULT_KEY_CER 
	$(hide) zip -qjX $@ $<

	$(remove-timestamps-from-package)



# Carry the public key for update_engine if it's a non-Brillo target that

# Carry the public key for update_engine if it's a non-IoT target that

# uses the AB updater. We use the same key as otacerts but in RSA public key

# format.

ifeq ($(AB_OTA_UPDATER),true)

ifeq ($(BRILLO),)

ifneq ($(PRODUCT_IOT),true)

ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem

$(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem: $(addsuffix .x509.pem,$(DEFAULT_KEY_CERT_PAIR))

	$(hide) rm -f $@

tools/signapk/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni 
include $(BUILD_HOST_JAVA_LIBRARY)



ifeq ($(TARGET_BUILD_APPS),)

ifeq ($(BRILLO),)

# The post-build signing tools need signapk.jar and its shared libraries,

# but we don't need this if we're just doing unbundled apps.

my_dist_files := $(LOCAL_INSTALLED_MODULE) \
@@ -39,4 +38,3 @@ my_dist_files := $(LOCAL_INSTALLED_MODULE) \ 
$(call dist-for-goals,droidcore,$(my_dist_files))

my_dist_files :=

endif
 
endif