commit 5caa679d629bd0867e48d4eaded9329c48de30a5
author Arthur Sfez <asfez@google.com> Wed Jul 21 15:07:26 2021 -0700
committer CQ Bot <commit-bot@chromium.org> Thu Jul 22 02:36:51 2021 +0000
tree 5d7384e0f71fc93b61d10a8b7892e164c9f6a891
parent bcb40bfa2a2f18b60de2cfcb0d8fa7c1f08d5981

[go] Update fidlc includes used by regen fidl

The script could not run fidlc successfully since fuchsia.net.interfaces
is a dependency of some of these fidl libraries.

While I'm here, clean-up not-neede dincludes for some targets.

Change-Id: Ia47703cde78f8c96732f22fb8fe4ec82cc58b08b
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/go/+/558109
Commit-Queue: Arthur Sfez <asfez@google.com>
Fuchsia-Auto-Submit: Arthur Sfez <asfez@google.com>
Reviewed-by: Tamir Duberstein <tamird@google.com>

api/fuchsia.txt

diff --git a/api/fuchsia.txt b/api/fuchsia.txt
index fd37a70..8a70097 100644
--- a/api/fuchsia.txt
+++ b/api/fuchsia.txt
@@ -6089,8 +6089,6 @@
 pkg syscall/zx/posix/socket, const InterfaceFlagsUp InterfaceFlags
 pkg syscall/zx/posix/socket, const InterfaceFlags_Mask = 65535
 pkg syscall/zx/posix/socket, const InterfaceFlags_Mask InterfaceFlags
-pkg syscall/zx/posix/socket, const InterfaceNameLength = 15
-pkg syscall/zx/posix/socket, const InterfaceNameLength uint8
 pkg syscall/zx/posix/socket, const OptionalUint32Unset = 2
 pkg syscall/zx/posix/socket, const OptionalUint32Unset ideal-int
 pkg syscall/zx/posix/socket, const OptionalUint32Value = 1

regen-fidl

diff --git a/regen-fidl b/regen-fidl
index 1732c36..050b92c 100755
--- a/regen-fidl
+++ b/regen-fidl
@@ -85,11 +85,13 @@
 
 generate_file sdk/fidl/fuchsia.posix.socket posix/socket \
   --files zircon/vdso/zx_common.fidl zircon/vdso/rights.fidl \
-  --files sdk/fidl/fuchsia.posix/*.fidl \
-  --files sdk/fidl/fuchsia.net/*.fidl \
   --files sdk/fidl/fuchsia.mem/*.fidl \
   --files sdk/fidl/fuchsia.io2/*.fidl \
-  --files sdk/fidl/fuchsia.io/*.fidl
+  --files sdk/fidl/fuchsia.io/*.fidl \
+  --files sdk/fidl/fuchsia.net/*.fidl \
+  --files sdk/fidl/fuchsia.hardware.network/*.fidl \
+  --files sdk/fidl/fuchsia.net.interfaces/*.fidl \
+  --files sdk/fidl/fuchsia.posix/*.fidl
 
 generate_file sdk/fidl/fuchsia.hardware.ethernet hardware/ethernet \
   --files zircon/vdso/zx_common.fidl zircon/vdso/rights.fidl
@@ -115,13 +117,8 @@
 
 generate_file sdk/fidl/fuchsia.net.stack net/stack \
   --files zircon/vdso/zx_common.fidl zircon/vdso/rights.fidl \
-  --files sdk/fidl/fuchsia.mem/*.fidl \
-  --files sdk/fidl/fuchsia.io2/*.fidl \
-  --files sdk/fidl/fuchsia.io/*.fidl \
   --files sdk/fidl/fuchsia.net/*.fidl \
-  --files sdk/fidl/fuchsia.net.name/*.fidl \
   --files sdk/fidl/fuchsia.hardware.ethernet/*.fidl \
   --files sdk/fidl/fuchsia.hardware.network/*.fidl \
-  --files sdk/fidl/fuchsia.posix/*.fidl \
-  --files sdk/fidl/fuchsia.posix.socket/*.fidl
-
+  --files sdk/fidl/fuchsia.net.interfaces/*.fidl \
+  --files sdk/fidl/fuchsia.net.name/*.fidl

src/syscall/zx/posix/socket/impl.go

diff --git a/src/syscall/zx/posix/socket/impl.go b/src/syscall/zx/posix/socket/impl.go
index 5cc7c57..3860759 100644
--- a/src/syscall/zx/posix/socket/impl.go
+++ b/src/syscall/zx/posix/socket/impl.go
@@ -14,11 +14,6 @@
 	fuchsiaposix "syscall/zx/posix"
 )
 
-const (
-	// The maximum length of an interface name.
-	InterfaceNameLength uint8 = 15
-)
-
 var _ _bindings.Enum = TcpCongestionControl(0)
 
 // TCP congestion control modes.