commit 19d6b0fbe545209f2d714183fb9c32da21e53843
author Bill Peckham <bpeckham@google.com> Fri Feb 15 16:45:54 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Feb 15 16:45:54 2019 -0800
tree 8138e5c51e183217670d57037895839cbbb31796
parent 27a67bac5ce0a5785d2c6bd92cc4a8e8ab1fbfa6
parent f3c50438c3b8d302f4e3e1ea2010ce40157205e1

Merge "Include soong_zip in OTA tools package."
am: f3c50438c3

Change-Id: Ice539fef08bd66a82cb6b2ba60d4c7da617fc9eb

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index ead6754..c6cfa10 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3497,6 +3497,7 @@
 	$(hide) rm -rf $@ $(zip_root)
 	$(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools
 	$(call copy-files-with-structure,$(OTATOOLS),$(HOST_OUT)/,$(zip_root))
+	$(hide) cp $(SOONG_ZIP) $(zip_root)/bin/
 	$(hide) cp -r -d -p build/make/tools/releasetools/* $(zip_root)/releasetools
 	$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
 	$(hide) $(SOONG_ZIP) -o $@ -C $(zip_root) -D $(zip_root) \