commit 526551f0132dd40d09f237c57b73c7424e0564a7
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 29 06:54:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 06:54:01 2020 +0000
tree f3f1f1d0be6ec533ae13d33fc12d62c9ab91f632
parent 0434412bcdba2ac9f766f61e556d914c2681d954
parent 3ec918d342bbeb9e2cb5f86370fb23af5b5efeb1

Merge "Remove unused no_vendor_variant_vndk_check target"

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