openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Don't include the dev-key on IOT products." am: 41febee0cc am: b20d1d7a74 

am: b83d6d50ab

Change-Id: I09c22951828599f7d0b3f290d0297bc06455528c
This commit is contained in:
Alex Deymo 2017-04-04 00:57:10 +00:00 committed by android-build-merger
parent b2fedccb26 b83d6d50ab
commit 4775eb67db
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

@ -815,11 +815,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 $@

2
tools/signapk/Android.mk
View File

@ -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