Revert "Revert "Build FUTILITY tool from futility-host."" am: 69ad150dd3 (98eb433d) · Commits · e / os / android_build

core/Makefile

+6 −3

core/config.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -566,7 +566,7 @@ APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg
	VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer		VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer
	BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree		BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree
	BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer		BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer
	FUTILITY := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/futility/futility		FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host
	VBOOT_SIGNER := prebuilts/misc/scripts/vboot_signer/vboot_signer.sh		VBOOT_SIGNER := prebuilts/misc/scripts/vboot_signer/vboot_signer.sh
	FEC := $(HOST_OUT_EXECUTABLES)/fec		FEC := $(HOST_OUT_EXECUTABLES)/fec

Original line number	Original line	Diff line number	Diff line
	@@ -826,7 +826,7 @@ $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_VERITY_PARTITION),$(hide) ech
	$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)" >> $(1))		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)" >> $(1))
	$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY)" >> $(1))		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY)" >> $(1))
	$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_subkey=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_SUBKEY)" >> $(1))		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_subkey=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_SUBKEY)" >> $(1))
	$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "futility=$(FUTILITY)" >> $(1))		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "futility=$(notdir $(FUTILITY))" >> $(1))
	$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_signer_cmd=$(VBOOT_SIGNER)" >> $(1))		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_signer_cmd=$(VBOOT_SIGNER)" >> $(1))
	$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\		$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\
	$(hide) echo "recovery_as_boot=true" >> $(1))		$(hide) echo "recovery_as_boot=true" >> $(1))
	@@ -1591,7 +1591,9 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
	$(HOST_OUT_EXECUTABLES)/brillo_update_payload \		$(HOST_OUT_EXECUTABLES)/brillo_update_payload \
	$(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \		$(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \
	$(HOST_OUT_EXECUTABLES)/delta_generator \		$(HOST_OUT_EXECUTABLES)/delta_generator \
	$(BLK_ALLOC_TO_BASE_FS)		$(BLK_ALLOC_TO_BASE_FS) \
			$(FUTILITY) \
			$(VBOOT_SIGNER)

	# Shared libraries.		# Shared libraries.
	OTATOOLS += \		OTATOOLS += \
	@@ -1630,10 +1632,11 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot
	$(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) \| $(ACP)		$(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) \| $(ACP)
	@echo "Package OTA tools: $@"		@echo "Package OTA tools: $@"
	$(hide) rm -rf $@ $(zip_root)		$(hide) rm -rf $@ $(zip_root)
	$(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/system/extras/verity		$(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
	$(call copy-files-with-structure,$(OTATOOLS),$(HOST_OUT)/,$(zip_root))		$(call copy-files-with-structure,$(OTATOOLS),$(HOST_OUT)/,$(zip_root))
	$(hide) $(ACP) $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar $(zip_root)/framework/		$(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 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		$(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools
	$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc		$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
	$(hide) (cd $(zip_root) && zip -qryX $(abspath $@) *)		$(hide) (cd $(zip_root) && zip -qryX $(abspath $@) *)