commit b43aafbee2b70e276f4e6dc8ee0a3ff3d126a277
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 29 06:46:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 29 06:46:40 2020 +0000
tree eb6802d9ff4b4258b557e986d5dcb40da34d830c
parent da8d33098017e5064cc5463507f9dd0da7a07faf
parent 4b60a5399df32b78f6068abab88b50a4d6c66186

Merge "Add explicitly merge_zips to otatools package" am: 0434412bcd am: 7d88e726cc am: 4b60a5399d

Change-Id: I5646e52d8c6c2900c8366f9be24d5d866c997402

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