aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Peckham <bpeckham@google.com>2019-02-16 00:38:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-02-16 00:38:07 +0000
commitf3c50438c3b8d302f4e3e1ea2010ce40157205e1 (patch)
tree754084ec459d8c28802ee9bc4f7683f6e36e76c3
parent7848e3cfef412e3dc53b3588a63faf28381b8de7 (diff)
parenteabb713f154c13a8d6b9689476b96fbb683a480f (diff)
downloadbuild-f3c50438c3b8d302f4e3e1ea2010ce40157205e1.tar.gz
Merge "Include soong_zip in OTA tools package."
-rw-r--r--core/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index ead675454e..c6cfa10900 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3497,6 +3497,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS)
$(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) \