Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9186f2b authored by Tao Bao's avatar Tao Bao
Browse files

Revert "Build FUTILITY tool from futility-host." 

Broke ryu targets.

This reverts commit a7726c1e.

Change-Id: Icec9da939a50c794b15ba3f40e8307f8829254c7
parent a7726c1e

core/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -813,7 +813,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_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 "futility=$(notdir $(FUTILITY))" >> $(1))

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "futility=$(FUTILITY)" >> $(1))

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_signer_cmd=$(VBOOT_SIGNER)" >> $(1))

$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

    $(hide) echo "recovery_as_boot=true" >> $(1))
@@ -1505,9 +1505,7 @@ 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) \

  $(FUTILITY) \

  $(VBOOT_SIGNER)

  $(BLK_ALLOC_TO_BASE_FS)



# Shared libraries.

OTATOOLS += \
@@ -1546,11 +1544,10 @@ $(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

	$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc

	$(hide) (cd $(zip_root) && zip -qryX $(abspath $@) *)

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg 
VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer

FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host

FUTILITY := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/futility/futility

VBOOT_SIGNER := prebuilts/misc/scripts/vboot_signer/vboot_signer.sh

FEC := $(HOST_OUT_EXECUTABLES)/fec