Browse Source

util/eventbus: also disable websocket debug on Android

So tsnet-on-Android is smaller, like iOS.

Updates #12614
Updates #15297

Change-Id: I97ae997f5d17576024470fe5fea93d9f5f134bde
Signed-off-by: Brad Fitzpatrick <[email protected]>
Brad Fitzpatrick 10 months ago
parent
commit
e2814871a7
3 changed files with 11 additions and 9 deletions
  1. 7 7
      tsnet/depaware.txt
  2. 1 1
      util/eventbus/debughttp.go
  3. 3 1
      util/eventbus/debughttp_off.go

+ 7 - 7
tsnet/depaware.txt

@@ -80,10 +80,10 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
    L    github.com/aws/smithy-go/transport/http                      from github.com/aws/aws-sdk-go-v2/aws/middleware+
    L    github.com/aws/smithy-go/transport/http/internal/io          from github.com/aws/smithy-go/transport/http
    L    github.com/aws/smithy-go/waiter                              from github.com/aws/aws-sdk-go-v2/service/ssm
- LDWA    github.com/coder/websocket                                   from tailscale.com/util/eventbus
- LDWA    github.com/coder/websocket/internal/errd                     from github.com/coder/websocket
- LDWA    github.com/coder/websocket/internal/util                     from github.com/coder/websocket
- LDWA    github.com/coder/websocket/internal/xsync                    from github.com/coder/websocket
+ LDW    github.com/coder/websocket                                   from tailscale.com/util/eventbus
+ LDW    github.com/coder/websocket/internal/errd                     from github.com/coder/websocket
+ LDW    github.com/coder/websocket/internal/util                     from github.com/coder/websocket
+ LDW    github.com/coder/websocket/internal/xsync                    from github.com/coder/websocket
    L    github.com/coreos/go-iptables/iptables                       from tailscale.com/util/linuxfw
    W 💣 github.com/dblohm7/wingoes                                   from github.com/dblohm7/wingoes/com+
    W 💣 github.com/dblohm7/wingoes/com                               from tailscale.com/util/osdiag+
@@ -552,7 +552,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
         hash/crc32                                                   from compress/gzip+
         hash/maphash                                                 from go4.org/mem
         html                                                         from html/template+
- LDWA    html/template                                                from github.com/gorilla/csrf+
+ LDW    html/template                                                from github.com/gorilla/csrf+
         internal/abi                                                 from crypto/x509/internal/macos+
         internal/asan                                                from internal/runtime/maps+
         internal/bisect                                              from internal/godebug
@@ -639,8 +639,8 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
         sync/atomic                                                  from context+
         syscall                                                      from archive/tar+
         text/tabwriter                                               from runtime/pprof
- LDWA    text/template                                                from html/template
- LDWA    text/template/parse                                          from html/template+
+ LDW    text/template                                                from html/template
+ LDW    text/template/parse                                          from html/template+
         time                                                         from archive/tar+
         unicode                                                      from bytes+
         unicode/utf16                                                from crypto/x509+

+ 1 - 1
util/eventbus/debughttp.go

@@ -1,7 +1,7 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:build !ios
+//go:build !ios && !android
 
 package eventbus
 

+ 3 - 1
util/eventbus/debughttp_ios.go → util/eventbus/debughttp_off.go

@@ -1,7 +1,7 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:build ios
+//go:build ios || android
 
 package eventbus
 
@@ -12,6 +12,8 @@ func registerHTTPDebugger(d *Debugger, td *tsweb.DebugHandler) {
 	// reflection for method lookups. This forces the compiler to
 	// retain a lot more code and information to make dynamic method
 	// dispatch work, which is unacceptable bloat for the iOS build.
+	// We also disable it on Android while we're at it, as nobody
+	// is debugging Tailscale internals on Android.
 	//
 	// TODO: https://github.com/tailscale/tailscale/issues/15297 to
 	// bring the debug UI back to iOS somehow.