From a41ca8fa8285754d8561dcc3ed54cca2da60eed7 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Wed, 30 Oct 2019 12:09:08 -0700 Subject: sys/targets: fix Fuchsia build Zircon directories have changed. Again. --- sys/targets/targets.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/targets/targets.go b/sys/targets/targets.go index f30a10c2c..a30c2e769 100644 --- a/sys/targets/targets.go +++ b/sys/targets/targets.go @@ -256,9 +256,10 @@ var List = map[string]map[string]*Target{ "-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 @@ var List = map[string]map[string]*Target{ "-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"), }, -- cgit mrf-deployment