fix: change default path

Author: anasfanani

logpolicy/logpolicy.go

@@ -28,7 +28,6 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/sys/unix"
 	"golang.org/x/term"
 	"tailscale.com/atomicfile"
 	"tailscale.com/envknob"
@@ -254,14 +253,15 @@ func LogsDir(logf logger.Logf) string {
 	}
 
 	cacheDir, err := os.UserCacheDir()
-	if _, exists := os.LookupEnv("ANDROID_DATA"); exists {
-		if tmp := os.TempDir(); tmp != "" {
-			if err := unix.Access(tmp, unix.W_OK); err == nil {
-				cacheDir = tmp
-			} else {
-				logf("logpolicy: temp directory %q is not writable: %v", tmp, err)
+	if runtime.GOOS == "android" {
+		prefix := os.Getenv("PREFIX")
+		if prefix == "" {
+			if os.Geteuid() == 0 {
+				return filepath.Join("data", "adb", "tailscale", "log")
 			}
+			return filepath.Join(os.TempDir(), "tailscale", "log")
 		}
+		return filepath.Join(prefix, "var", "log", "tailscale")
 	}
 	if err == nil {
 		d := filepath.Join(cacheDir, "Tailscale")

paths/paths.go

@@ -23,15 +23,14 @@ var AppSharedDir syncs.AtomicValue[string]
 // or the empty string if there's no reasonable default.
 func DefaultTailscaledSocket() string {
 	if runtime.GOOS == "android" {
-		if os.Geteuid() == 0 {
-			if fi, err := os.Stat("/data/adb/tailscale"); err == nil && fi.IsDir() {
-				return "/data/adb/tailscale/tailscaled.sock"
+		prefix := os.Getenv("PREFIX")
+		if prefix == "" {
+			if os.Geteuid() == 0 {
+				return filepath.Join("data", "adb", "tailscale", "tmp", "tailscaled.sock")
 			}
+			return filepath.Join(os.TempDir(), "tailscale", "tailscaled.sock")
 		}
-		if wd, err := os.Getwd(); err == nil {
-			return filepath.Join(wd, "tailscaled.sock")
-		}
-		return filepath.Join(os.TempDir(), "tailscaled.sock")
+		return filepath.Join(prefix, "var", "run", "tailscaled.sock")
 	}
 	if runtime.GOOS == "windows" {
 		return `\\.\pipe\ProtectedPrefix\Administrators\Tailscale\tailscaled`

paths/paths_unix.go

@@ -33,6 +33,15 @@ func statePath() string {
 		return "/Library/Tailscale/tailscaled.state"
 	case "aix":
 		return "/var/tailscale/tailscaled.state"
+	case "android":
+		prefix := os.Getenv("PREFIX")
+		if prefix == "" {
+			if os.Geteuid() == 0 {
+				return filepath.Join("data", "adb", "tailscale", "tmp", "tailscaled.state")
+			}
+			return filepath.Join(os.TempDir(), "tailscale", "tailscaled.state")
+		}
+		return filepath.Join(prefix, "var", "lib", "tailscale", "tailscaled.state")
 	default:
 		return ""
 	}

tsweb/tsweb.go

@@ -40,6 +40,16 @@ import (
 var DevMode bool
 
 func DefaultCertDir(leafDir string) string {
+	if runtime.GOOS == "android" {
+		prefix := os.Getenv("PREFIX")
+		if prefix == "" {
+			if os.Geteuid() == 0 {
+				return filepath.Join("data", "adb", "tailscale", "certs")
+			}
+			return filepath.Join(os.TempDir(), "tailscale", "certs")
+		}
+		return filepath.Join(prefix, "var", "lib", "tailscale", "certs")
+	}
 	cacheDir, err := os.UserCacheDir()
 	if err == nil {
 		return filepath.Join(cacheDir, "tailscale", leafDir)