Look for fidl libraries in fuchsia/sdk/banjo
Bug: 72629
Change-Id: Idd863f42bd176551c400b8f179c96612e4145cea
Reviewed-on: https://fuchsia-review.googlesource.com/c/fidlbolt/+/646082
Reviewed-by: Yifei Teng <yifeit@google.com>
diff --git a/Makefile b/Makefile
index 68542dd..4d20d8e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,9 @@
endif
bin := ./deployment/bin
etc := ./deployment/etc
+# TODO(fxbug.dev/72629) Remove banjo.
fidl := ./deployment/fuchsia/sdk/fidl$\
+ :./deployment/fuchsia/sdk/banjo$\
:./deployment/fuchsia/zircon
else
build_dir := $(file < $(FUCHSIA_DIR)/.fx-build-dir)
@@ -38,7 +40,9 @@
:$(FUCHSIA_DIR)/prebuilt/third_party/clang/$(host_platform)/bin$\
:$(FUCHSIA_DIR)/prebuilt/third_party/rust/$(host_platform)/bin
etc := $(FUCHSIA_DIR)
+# TODO(fxbug.dev/72629) Remove banjo.
fidl := $(FUCHSIA_DIR)/sdk/fidl$\
+ :$(FUCHSIA_DIR)/sdk/banjo$\
:$(FUCHSIA_DIR)/zircon
endif
diff --git a/prepare_deployment.sh b/prepare_deployment.sh
index 567c6cf..637aec9 100755
--- a/prepare_deployment.sh
+++ b/prepare_deployment.sh
@@ -122,6 +122,9 @@
step "Copying FIDL libraries"
find "$FUCHSIA_DIR/sdk/fidl" -mindepth 1 -maxdepth 1 -type d -print0 \
| xargs -0 -I% cp -r % deployment/fuchsia/sdk/fidl
+# TODO(fxbug.dev/72629) Remove banjo.
+find "$FUCHSIA_DIR/sdk/banjo" -mindepth 1 -maxdepth 1 -type d -print0 \
+ | xargs -0 -I% cp -r % deployment/fuchsia/sdk/banjo
cp -r "$FUCHSIA_DIR/zircon/vdso" deployment/fuchsia/zircon/vdso
# Remove the non-fidl files. This is easier and less error-prone than
# manipulating paths to call mkdir -p and only copying the .fidl files.
