diff --git a/Makefile b/Makefile index c531506..94c9fd4 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ all: $(APK) aar: mkdir -p android/libs - go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -o $(AAR) tailscale.com/tailscale-android/cmd/tailscale + go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale $(DEBUG_APK): aar (cd android && ./gradlew assembleDebug) diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go index b4ae99e..18fd96f 100644 --- a/cmd/tailscale/backend.go +++ b/cmd/tailscale/backend.go @@ -12,6 +12,7 @@ import ( "reflect" "time" + "github.com/tailscale/tailscale-android/jni" "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/unix" @@ -19,7 +20,6 @@ import ( "tailscale.com/logpolicy" "tailscale.com/logtail" "tailscale.com/logtail/filch" - "tailscale.com/tailscale-android/jni" "tailscale.com/types/logger" "tailscale.com/wgengine" "tailscale.com/wgengine/router" diff --git a/cmd/tailscale/callbacks.go b/cmd/tailscale/callbacks.go index e5cfabe..99d2402 100644 --- a/cmd/tailscale/callbacks.go +++ b/cmd/tailscale/callbacks.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "unsafe" - "tailscale.com/tailscale-android/jni" + "github.com/tailscale/tailscale-android/jni" ) // #include diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go index 3da9044..27a8580 100644 --- a/cmd/tailscale/main.go +++ b/cmd/tailscale/main.go @@ -16,10 +16,10 @@ import ( "gioui.org/layout" "gioui.org/op" + "github.com/tailscale/tailscale-android/jni" "tailscale.com/control/controlclient" "tailscale.com/ipn" "tailscale.com/tailcfg" - "tailscale.com/tailscale-android/jni" "tailscale.com/wgengine/router" ) diff --git a/cmd/tailscale/store.go b/cmd/tailscale/store.go index f3acc01..f14a616 100644 --- a/cmd/tailscale/store.go +++ b/cmd/tailscale/store.go @@ -8,7 +8,8 @@ import ( "encoding/base64" "tailscale.com/ipn" - "tailscale.com/tailscale-android/jni" + + "github.com/tailscale/tailscale-android/jni" ) // stateStore is the Go interface for a persistent storage diff --git a/go.mod b/go.mod index 96187c6..750233e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module tailscale.com/tailscale-android +module github.com/tailscale/tailscale-android go 1.14