Fix the bad merge of conditionally packaging VBOOT_SIGNER tools CL.
Commit d2aed4309a5f3c9c47013b56a6eab555cf7b12f7 didn't get merged
correctly when flowing from AOSP into internal. It only added the new
lines but without deleting the old lines (due to an inconsistent revert
in internal branch).
Bug: 35467608
Test: lunch bullhead-userdebug; m otatools-package; verify the generated
otatools.zip doesn't include VBOOT_SIGNER stuff.
Change-Id: I49064bb7beb1215543037cf94712d03b0c2537b2
diff --git a/core/Makefile b/core/Makefile
index dfec8bb..b8c5ab1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1816,9 +1816,7 @@
$(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)
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
OTATOOLS += \
@@ -1863,11 +1861,10 @@
$(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