From 5e04c38bbd598390d26394b3ddb3097f8e4a1085 Mon Sep 17 00:00:00 2001 From: Tao Bao <tbao@google.com> Date: Wed, 22 Feb 2017 16:38:19 -0800 Subject: [PATCH] Make the packaging of VBOOT_SIGNER tools conditional. Otherwise it may fail the targets that don't have external/vboot_reference in the manifest. Bug: 35467608 Test: lunch aosp_dragon-userdebug; m otatools-package Test: lunch aosp_bullhead-userdebug; m otatools-package Change-Id: I35700a4d7d0723992badcfb4a03be85d07a4b9a9 (cherry picked from commit d2aed4309a5f3c9c47013b56a6eab555cf7b12f7) --- core/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 746d916fa..0149b9581 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1505,9 +1505,13 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/brillo_update_payload \ $(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \ $(HOST_OUT_EXECUTABLES)/delta_generator \ - $(BLK_ALLOC_TO_BASE_FS) \ + $(BLK_ALLOC_TO_BASE_FS) + +ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)) +OTATOOLS += \ $(FUTILITY) \ $(VBOOT_SIGNER) +endif # Shared libraries. OTATOOLS += \ @@ -1546,12 +1550,15 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP) @echo "Package OTA tools: $@" $(hide) rm -rf $@ $(zip_root) - $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/system/extras/verity $(zip_root)/external/vboot_reference/tests/devkeys + $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/system/extras/verity $(call copy-files-with-structure,$(OTATOOLS),$(HOST_OUT)/,$(zip_root)) $(hide) $(ACP) $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar $(zip_root)/framework/ $(hide) $(ACP) -p system/extras/verity/build_verity_metadata.py $(zip_root)/system/extras/verity/ - $(hide) $(ACP) -p -r external/vboot_reference/tests/devkeys/* $(zip_root)/external/vboot_reference/tests/devkeys $(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools +ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)) + $(hide) mkdir -p $(zip_root)/external/vboot_reference/tests/devkeys + $(hide) $(ACP) -r -d -p external/vboot_reference/tests/devkeys/* $(zip_root)/external/vboot_reference/tests/devkeys +endif $(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc $(hide) (cd $(zip_root) && zip -qryX $(abspath $@) *) $(hide) zip -qryX $(abspath $@) build/target/product/security/