Skip to content

Commit d2c005f

Browse files
authored
android: bump OSS (#693)
OSS and Version updated to 1.87.107-t3aea0e095-g9b07f33d7 Signed-off-by: Jonathan Nobels <[email protected]>
1 parent 9b07f33 commit d2c005f

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/tailscale/tailscale-android
22

3-
go 1.24.6
3+
go 1.25.0
44

55
require (
66
github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da
77
golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab
8-
tailscale.com v1.87.0-pre.0.20250814174806-c083a9b05330
8+
tailscale.com v1.87.0-pre.0.20250829053524-3aea0e095a41
99
)
1010

1111
require (
@@ -33,7 +33,7 @@ require (
3333
github.com/djherbis/times v1.6.0 // indirect
3434
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3535
github.com/gaissmai/bart v0.18.0 // indirect
36-
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 // indirect
36+
github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced // indirect
3737
github.com/go-ole/go-ole v1.3.0 // indirect
3838
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
3939
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ github.com/gaissmai/bart v0.18.0 h1:jQLBT/RduJu0pv/tLwXE+xKPgtWJejbxuXAR+wLJafo=
6767
github.com/gaissmai/bart v0.18.0/go.mod h1:JJzMAhNF5Rjo4SF4jWBrANuJfqY+FvsFhW7t1UZJ+XY=
6868
github.com/github/fakeca v0.1.0 h1:Km/MVOFvclqxPM9dZBC4+QE564nU4gz4iZ0D9pMw28I=
6969
github.com/github/fakeca v0.1.0/go.mod h1:+bormgoGMMuamOscx7N91aOuUST7wdaJ2rNjeohylyo=
70-
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 h1:F8d1AJ6M9UQCavhwmO6ZsrYLfG8zVFWfEfMS2MXPkSY=
71-
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
70+
github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced h1:Q311OHjMh/u5E2TITc++WlTP5We0xNseRMkHDyvhW7I=
71+
github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
7272
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
7373
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
7474
github.com/go4org/plan9netshell v0.0.0-20250324183649-788daa080737 h1:cf60tHxREO3g1nroKr2osU3JWZsJzkfi7rEg+oAB0Lo=
@@ -235,5 +235,5 @@ howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
235235
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
236236
software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=
237237
software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=
238-
tailscale.com v1.87.0-pre.0.20250814174806-c083a9b05330 h1:AKtuZB1fqLwc7gjGtTpFRTDBFyIV+H4nqm3S3saKGus=
239-
tailscale.com v1.87.0-pre.0.20250814174806-c083a9b05330/go.mod h1:7T150+pAJhl3Yw2RTBMihVa9D2wdGJ+kxVQQSJbLHkc=
238+
tailscale.com v1.87.0-pre.0.20250829053524-3aea0e095a41 h1:PP6OuLqQ/r/G7MtgKXDxL4NwQLUR+dqWPWM5y7r0SZY=
239+
tailscale.com v1.87.0-pre.0.20250829053524-3aea0e095a41/go.mod h1:ZcA4K9Xppr41mrKznPIxR2eRjVQf8g8v9nB/YBKTe10=

go.toolchain.rev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
54f31cd8fc7b3d7d87c1ea455c8bb4b33372f706
1+
f3339c88ea24212cc3cd49b64ad1045b85db23bf

libtailscale/backend.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,14 @@ func (a *App) runBackend(ctx context.Context) error {
141141
a.backend = b.backend
142142
defer b.CloseTUNs()
143143

144-
h := localapi.NewHandler(ipnauth.Self, b.backend, log.Printf, *a.logIDPublicAtomic.Load())
144+
hc := localapi.HandlerConfig{
145+
Actor: ipnauth.Self,
146+
Backend: b.backend,
147+
Logf: log.Printf,
148+
LogID: *a.logIDPublicAtomic.Load(),
149+
EventBus: b.bus,
150+
}
151+
h := localapi.NewHandler(hc)
145152
h.PermitRead = true
146153
h.PermitWrite = true
147154
a.localAPIHandler = h

0 commit comments

Comments
 (0)