Stop using zircon/system/fidl
Build unification has moved all libraries from zircon/system/fidl into
sdk/fidl. It is no longer necessary to copy from that directory when
preparing a deployment.
Change-Id: I8989b830d1cd136876841271af0f8f7efdeb42b5
diff --git a/Dockerfile b/Dockerfile
index 743d2ec..a184884 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,4 +29,4 @@
"-static", "/static", \
"-bin", "/deployment/bin", \
"-etc", "/deployment/etc", \
- "-fidl", "/deployment/fuchsia/sdk/fidl:/deployment/fuchsia/zircon:/deployment/fuchsia/zircon/system/fidl"]
+ "-fidl", "/deployment/fuchsia/sdk/fidl:/deployment/fuchsia/zircon"]
diff --git a/Makefile b/Makefile
index c23d252..f45a414 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,7 @@
bin := ./deployment/bin
etc := ./deployment/etc
fidl := ./deployment/fuchsia/sdk/fidl$\
- :./deployment/fuchsia/zircon$\
- :./deployment/fuchsia/zircon/system/fidl
+ :./deployment/fuchsia/zircon
else
build_dir := $(FUCHSIA_DIR)/$(file < $(FUCHSIA_DIR)/.fx-build-dir)
bin := $(build_dir)/host_x64$\
@@ -35,8 +34,7 @@
:$(FUCHSIA_DIR)/prebuilt/third_party/rust/$(host_platform)/bin
etc := $(FUCHSIA_DIR)
fidl := $(FUCHSIA_DIR)/sdk/fidl$\
- :$(FUCHSIA_DIR)/zircon$\
- :$(FUCHSIA_DIR)/zircon/system/fidl
+ :$(FUCHSIA_DIR)/zircon
endif
# Path to the server binary.
diff --git a/prepare_deployment.sh b/prepare_deployment.sh
index 8e020a8..e6d80e3 100755
--- a/prepare_deployment.sh
+++ b/prepare_deployment.sh
@@ -83,7 +83,7 @@
step "Cleaning ./deployment"
cd "$(dirname "$0")"
rm -rf deployment/
-mkdir -p deployment/{bin,etc,fuchsia/{sdk/fidl,zircon/system/fidl}}
+mkdir -p deployment/{bin,etc,fuchsia/{sdk/fidl,zircon}}
step "Copying binaries"
cp \
@@ -95,8 +95,6 @@
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
-find "$FUCHSIA_DIR/zircon/system/fidl" -mindepth 1 -maxdepth 1 -type d -print0 \
- | xargs -0 -I% cp -r % deployment/fuchsia/zircon/system/fidl
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.
