commit a41ca8fa8285754d8561dcc3ed54cca2da60eed7
author Matthew Dempsky <mdempsky@google.com> Wed Oct 30 12:09:08 2019 -0700
committer Marco Vanotti <mvanotti@users.noreply.github.com> Wed Oct 30 13:28:29 2019 -0700
tree ed59a240ec84b3e057c1d12ef37d7f95b69b7a95
parent d70278b72409393fbe1fd8f40f361f600c8e69ab

sys/targets: fix Fuchsia build

Zircon directories have changed. Again.

sys/targets/targets.go

diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index f30a10c..a30c2e7 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -256,9 +256,10 @@
 				"-I", os.ExpandEnv("${SOURCEDIR}/zircon/system/ulib/ddk/include"),
 				"-I", os.ExpandEnv("${SOURCEDIR}/zircon/system/ulib/fdio/include"),
 				"-I", os.ExpandEnv("${SOURCEDIR}/zircon/system/ulib/fidl/include"),
-				"-I", os.ExpandEnv("${SOURCEDIR}/out/x64/fidling/gen/zircon/public/fidl/fuchsia-device"),
-				"-I", os.ExpandEnv("${SOURCEDIR}/out/x64/fidling/gen/zircon/public/fidl/fuchsia-hardware-nand"),
-				"-I", os.ExpandEnv("${SOURCEDIR}/out/x64/fidling/gen/zircon/public/fidl/fuchsia-hardware-usb-peripheral"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/x64/fidling/gen/zircon/system/fidl/fuchsia-device"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/x64/fidling/gen/zircon/system/fidl/fuchsia-device-manager"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/x64/fidling/gen/zircon/system/fidl/fuchsia-hardware-nand"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/x64/fidling/gen/zircon/system/fidl/fuchsia-hardware-usb-peripheral"),
 				"-L", os.ExpandEnv("${SOURCEDIR}/out/x64/gen/zircon/public/lib/driver"),
 				"-L", os.ExpandEnv("${SOURCEDIR}/out/x64/gen/zircon/public/lib/fdio"),
 			},
@@ -278,9 +279,10 @@
 				"-I", os.ExpandEnv("${SOURCEDIR}/zircon/system/ulib/ddk/include"),
 				"-I", os.ExpandEnv("${SOURCEDIR}/zircon/system/ulib/fdio/include"),
 				"-I", os.ExpandEnv("${SOURCEDIR}/zircon/system/ulib/fidl/include"),
-				"-I", os.ExpandEnv("${SOURCEDIR}/out/arm64/fidling/gen/zircon/public/fidl/fuchsia-device"),
-				"-I", os.ExpandEnv("${SOURCEDIR}/out/arm64/fidling/gen/zircon/public/fidl/fuchsia-hardware-nand"),
-				"-I", os.ExpandEnv("${SOURCEDIR}/out/arm64/fidling/gen/zircon/public/fidl/fuchsia-hardware-usb-peripheral"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/arm64/fidling/gen/zircon/system/fidl/fuchsia-device"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/arm64/fidling/gen/zircon/system/fidl/fuchsia-device-manager"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/arm64/fidling/gen/zircon/system/fidl/fuchsia-hardware-nand"),
+				"-I", os.ExpandEnv("${SOURCEDIR}/out/arm64/fidling/gen/zircon/system/fidl/fuchsia-hardware-usb-peripheral"),
 				"-L", os.ExpandEnv("${SOURCEDIR}/out/arm64/gen/zircon/public/lib/driver"),
 				"-L", os.ExpandEnv("${SOURCEDIR}/out/arm64/gen/zircon/public/lib/fdio"),
 			},