Make the packaging of VBOOT_SIGNER tools conditional. am: 5e04c38bbd (9084561e) · Commits · e / os / android_build

core/Makefile

+10 −3

Original line number	Diff line number	Diff line
		@@ -1591,9 +1591,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 += \
		@@ -1632,12 +1636,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/