From a37b2bb236486d5fc9158dbc66d1ff73a63c6e81 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Thu, 13 Nov 2014 17:54:30 -0800 Subject: [PATCH] Fix the build Bug: 15984840 Bug: 18120110 Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c --- core/Makefile | 2 +- tools/releasetools/build_image.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 8c4af9a89..8a816e952 100644 --- a/core/Makefile +++ b/core/Makefile @@ -725,7 +725,7 @@ $(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(IN $(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1)) $(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)" >> $(1)) -$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8" >> $(1)) +$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_signer_cmd=$(VERITY_SIGNER)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_VERITY_PARTITION),$(hide) echo "system_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_VERITY_PARTITION)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_VERITY_PARTITION),$(hide) echo "vendor_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_VERITY_PARTITION)" >> $(1)) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index a010e8415..93b31e826 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -160,7 +160,7 @@ def MakeVerityEnabledImage(out_file, prop_dict): # get properties image_size = prop_dict["partition_size"] block_dev = prop_dict["verity_block_device"] - signer_key = prop_dict["verity_key"] + signer_key = prop_dict["verity_key"] + ".pk8" signer_path = prop_dict["verity_signer_cmd"] # make a tempdir