diff --git a/tsnet/depaware.txt b/tsnet/depaware.txt index 2895a36a7..97046b73d 100644 --- a/tsnet/depaware.txt +++ b/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+ diff --git a/util/eventbus/debughttp.go b/util/eventbus/debughttp.go index 18888cc56..a94eaa9cf 100644 --- a/util/eventbus/debughttp.go +++ b/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 diff --git a/util/eventbus/debughttp_ios.go b/util/eventbus/debughttp_off.go similarity index 80% rename from util/eventbus/debughttp_ios.go rename to util/eventbus/debughttp_off.go index a898898b7..85330579c 100644 --- a/util/eventbus/debughttp_ios.go +++ b/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.