tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Treehugger Robot 2017-04-04 00:43:34 +00:00 committed by Gerrit Code Review
commit 41febee0cc
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Makefile
View file

@ -759,11 +759,11 @@ $(TARGET_OUT_ETC)/security/otacerts.zip: $(addsuffix .x509.pem,$(DEFAULT_KEY_CER
$(hide) zip -qjX $@ $< $(hide) zip -qjX $@ $<
$(remove-timestamps-from-package) $(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 # uses the AB updater. We use the same key as otacerts but in RSA public key
# format. # format.
ifeq ($(AB_OTA_UPDATER),true) 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 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)) $(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem: $(addsuffix .x509.pem,$(DEFAULT_KEY_CERT_PAIR))
$(hide) rm -f $@ $(hide) rm -f $@

2
tools/signapk/Android.mk
View file

@ -30,7 +30,6 @@ LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni
include $(BUILD_HOST_JAVA_LIBRARY) include $(BUILD_HOST_JAVA_LIBRARY)
ifeq ($(TARGET_BUILD_APPS),) ifeq ($(TARGET_BUILD_APPS),)
ifeq ($(BRILLO),)
# The post-build signing tools need signapk.jar and its shared libraries, # 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. # but we don't need this if we're just doing unbundled apps.
my_dist_files := $(LOCAL_INSTALLED_MODULE) \ my_dist_files := $(LOCAL_INSTALLED_MODULE) \
@ -39,4 +38,3 @@ my_dist_files := $(LOCAL_INSTALLED_MODULE) \
$(call dist-for-goals,droidcore,$(my_dist_files)) $(call dist-for-goals,droidcore,$(my_dist_files))
my_dist_files := my_dist_files :=
endif endif
endif