aboutsummaryrefslogtreecommitdiffstats
path: root/sys/fuchsia/layout
diff options
context:
space:
mode:
authorDavid Pursell <dpursell@google.com>2019-10-30 15:30:52 -0700
committerMarco Vanotti <mvanotti@users.noreply.github.com>2019-11-14 16:21:01 -0800
commita3f5ce76b10a3c0e2a07cd96bd5a29acc42ac532 (patch)
tree0ee594727b1918bb1cb627388ca34ac9b349a525 /sys/fuchsia/layout
parenta24fe792a6669a01f85fe26615e7e7a0ba802a8c (diff)
sys/fuchsia: fix Fuchsia extract/generate
Updates some paths and add zx_eventpair type definition to fix `make extract` and `make generate`.
Diffstat (limited to 'sys/fuchsia/layout')
-rw-r--r--sys/fuchsia/layout/fidl_mappings.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/fuchsia/layout/fidl_mappings.go b/sys/fuchsia/layout/fidl_mappings.go
index 48bcf7ca8..837a97332 100644
--- a/sys/fuchsia/layout/fidl_mappings.go
+++ b/sys/fuchsia/layout/fidl_mappings.go
@@ -37,9 +37,9 @@ var AllFidlLibraries = []FidlLibrary{
{zircon, []string{"fuchsia", "process"}},
{zircon, []string{"fuchsia", "io"}},
{zircon, []string{"fuchsia", "net"}},
- {zircon, []string{"fuchsia", "net", "stack"}},
{zircon, []string{"fuchsia", "hardware", "ethernet"}},
{garnet, []string{"fuchsia", "devicesettings"}},
+ {garnet, []string{"fuchsia", "net", "stack"}},
{garnet, []string{"fuchsia", "timezone"}},
{garnet, []string{"fuchsia", "scpi"}},
}
@@ -68,7 +68,7 @@ func (fidlLib FidlLibrary) PathToJSONIr() string {
func (fidlLib FidlLibrary) PathToCompiledDir() string {
switch fidlLib.layer {
case zircon:
- return filepath.Join("fidling", "gen", "zircon", "public", "fidl", fidlLib.dirName())
+ return filepath.Join("fidling", "gen", "zircon", "system", "fidl", fidlLib.dirName())
case garnet:
return filepath.Join("fidling", "gen", "sdk", "fidl", fidlLib.dirName())
default: