Merge branch 'main' into lan_access_fix

Author: Pawloland

.github/licenses.tmpl

@@ -11,6 +11,7 @@ The following open source dependencies are used to build the [Tailscale Android
 Client][].  See also the dependencies in the [Tailscale CLI][].
 
 [Tailscale Android Client]: https://github.com/tailscale/tailscale-android
+[Tailscale CLI]: ./tailscale.md
 
 ## Go Packages
 

.github/workflows/android.yml

@@ -30,6 +30,12 @@ jobs:
       - name: Clean
         run: make clean
 
+      - name: Format check (ktfmt)
+        run: make fmt-check
+  
+      - name: Run Go tests
+        run: make go-test
+
       - name: Build APKs
         run: make tailscale-debug.apk
 

.gitignore

@@ -47,3 +47,4 @@ libtailscale-sources.jar
 .DS_Store
 
 tailscale.version
+/local.properties

Makefile

@@ -182,8 +182,12 @@ build-unstripped-aar: tailscale.version $(GOBIN)/gomobile
 	rm -f $(ABS_UNSTRIPPED_AAR)
 	# The -linkmode=external -extldflags=-Wl,-z,max-page-size=16384 is specific to NDK 23
 	# to support 16kb page sizes.  Your mileage may vary with other NDK versions.
+	$(GOBIN)/gomobile version
+	./tool/go version
 	$(GOBIN)/gomobile bind -target android -androidapi 26 \
+	    -x \
 		-tags "$$(./build-tags.sh)" \
+		-gcflags="all=-N -l" \
 		-ldflags "-linkmode=external -extldflags=-Wl,-z,max-page-size=16384 $$(./version-ldflags.sh)" \
 		-o $(ABS_UNSTRIPPED_AAR) ./libtailscale || { echo "gomobile bind failed"; exit 1; }
 	@if [ ! -f $(ABS_UNSTRIPPED_AAR) ]; then \
@@ -311,6 +315,10 @@ checkandroidsdk: ## Check that Android SDK is installed
 		\tANDROID_SDK_ROOT=$(ANDROID_SDK_ROOT)\n\n\
 		See README.md for instructions on how to install the prerequisites.\n"; exit 1)
 
+.PHONY: go-test                                                                                                                                                                                                 
+  go-test: ## Run the Go tests (excludes packages requiring Android NDK)                                                                                                                                                                                     
+	./tool/go test $$(./tool/go list ./... | grep -v '^github.com/tailscale/tailscale-android/libtailscale$$')    
+
 .PHONY: test
 test: gradle-dependencies ## Run the Android tests
 	(cd android && ./gradlew test)

android/build.gradle

@@ -35,6 +35,8 @@ android {
     ndkVersion "23.1.7779620"
     compileSdkVersion 34
     defaultConfig {
+        // Explicit applicationId so we can override it for debug builds below.
+        applicationId "com.tailscale.ipn"
         minSdkVersion 26
         targetSdkVersion 35
         versionCode 468
@@ -86,6 +88,7 @@ android {
         }
         debug {
             manifestPlaceholders.leanbackRequired = false
+            packaging.jniLibs.keepDebugSymbols.add("**/*.so")
         }
         release {
             manifestPlaceholders.leanbackRequired = false
@@ -105,6 +108,15 @@ android {
     }
 
     testBuildType "applicationTest"
+
+    // Override the applicationId for the debug build variant so the installed
+    // package id becomes debug.com.tailscale.ipn.debug instead of
+    // com.tailscale.ipn, allowing for installing release and debug side by side
+    applicationVariants.all { variant ->
+        if (variant.buildType.name == 'debug') {
+            variant.mergedFlavor.applicationId = 'com.tailscale.ipn.debug'
+        }
+    }
 }
 
 dependencies {
@@ -150,7 +162,8 @@ dependencies {
     implementation("com.patrykandpatrick.vico:compose-m3:1.15.0")
 
     // Tailscale dependencies.
-    implementation ':libtailscale@aar'
+    releaseImplementation ':libtailscale@aar'
+    debugImplementation ':libtailscale_unstripped@aar'
 
     // Integration Tests
     androidTestImplementation composeBom

android/gradle.properties

@@ -1,3 +1,6 @@
+# This file is symlinked in project's git root directory, so regardless of opening the whole project's git root dir or only
+# ./android subdir in Android Studio, it will make AS see the same properties, because they are read only from the opened project's root directory,
+# and can't be linked or imported from submodules (like app module which is defined as ./android folder in project's git root settings.gradle)
 android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=true

android/src/debug/ic_launcher-playstore.png

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:tools="http://schemas.android.com/tools"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        tools:ignore="MonochromeLauncherIcon">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/src/debug/res/drawable-xhdpi/tv_banner.png

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:tools="http://schemas.android.com/tools"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        tools:ignore="MonochromeLauncherIcon">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>