commit 7eae4674695ce51ed661ff6a2c17b4d8469ef35d
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 08 01:00:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 08 01:00:32 2019 +0000
tree de01decf261ccfc27e5057706460d7dc64f7e6bb
parent 40c03ff116a6402267e43450720d31c5de6f1eed
parent a61cde074737c8bb301b6100d083aa13f08f8446

Merge "Begins merging META/dynamic_partitions_info.txt."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index d51ca9d..70421c4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4284,7 +4284,7 @@
 	$(hide) rm -rf $@ $(PRIVATE_LIST_FILE)
 	$(hide) mkdir -p $(dir $@) $(TARGET_OUT_UNSTRIPPED) $(dir $(PRIVATE_LIST_FILE))
 	$(hide) find -L $(TARGET_OUT_UNSTRIPPED) -type f | sort >$(PRIVATE_LIST_FILE)
-	$(hide) $(SOONG_ZIP) -d -o $@ -C $(OUT_DIR)/.. -l $(PRIVATE_LIST_FILE)
+	$(hide) $(SOONG_ZIP) --ignore_missing_files -d -o $@ -C $(OUT_DIR)/.. -l $(PRIVATE_LIST_FILE)
 # -----------------------------------------------------------------
 # A zip of the coverage directory.
 #

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index bf59fb1..1db37ef 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -608,7 +608,7 @@
 BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree
 BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer
 FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host
-VBOOT_SIGNER := prebuilts/misc/scripts/vboot_signer/vboot_signer.sh
+VBOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/vboot_signer
 FEC := $(HOST_OUT_EXECUTABLES)/fec
 BRILLO_UPDATE_PAYLOAD := $(HOST_OUT_EXECUTABLES)/brillo_update_payload