commit 7d88e726ccdcb6afe82d3ba406ec7231e185a649
author Baligh Uddin <baligh@google.com> Tue Jan 28 22:24:38 2020 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 28 22:24:38 2020 -0800
tree 0f185da7cedce010a093c99db6c72118d49147ad
parent 10ef03e4fc4aef42dd8e658ea5014c9b2ab8f45a
parent 0434412bcdba2ac9f766f61e556d914c2681d954

Merge "Add explicitly merge_zips to otatools package"
am: 0434412bcd

Change-Id: I2b536927f621f7d7cc6fcd0fdc246433bcea4db4

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 738f53a..0aa06d9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3894,7 +3894,7 @@
 	mkdir -p $(dir $@)
 	$(call copy-files-with-structure,$(PRIVATE_OTATOOLS_PACKAGE_FILES),$(HOST_OUT)/,$(PRIVATE_ZIP_ROOT))
 	$(call copy-files-with-structure,$(PRIVATE_OTATOOLS_RELEASETOOLS),build/make/tools/,$(PRIVATE_ZIP_ROOT))
-	cp $(SOONG_ZIP) $(ZIP2ZIP) $(PRIVATE_ZIP_ROOT)/bin/
+	cp $(SOONG_ZIP) $(ZIP2ZIP) $(MERGE_ZIPS) $(PRIVATE_ZIP_ROOT)/bin/
 	$(SOONG_ZIP) -o $@ -C $(PRIVATE_ZIP_ROOT) -D $(PRIVATE_ZIP_ROOT)
 
 .PHONY: otatools-package