Makefile: make unstripped libtailscale and debug symbols

- Added Makefile targets to build an unstripped version of the libtailscale AAR.
- Extracted the native .so (libgojni.so) from the unstripped AAR.
- Generated a debug symbols file (libgojni.so.debug) using llvm-objcopy with --only-keep-debug.
- Stripped the native library (libgojni.so.stripped) with --strip-debug and repackaged the final AAR.

This allows the build chain to produce a stripped AAR for the app and a separate debug symbols file that can be uploaded to Google Play for crash deobfuscation.

Signed-off-by: kari-ts <[email protected]>
Updates tailscale/tailscale#15210

Author: kari-ts

.github/workflows/android.yml

@@ -29,6 +29,15 @@ jobs:
       # Clean should essentially be a no-op, but make sure that it works.
       - name: Clean
         run: make clean
+      
+      - name: print android lib
+        run: make list-android-libs
+      
+      - name: print working dir
+        run: make print-working-dir
+
+      - name: debug unstripped
+        run: make debug-unstripped
 
       - name: Build APKs
         run: make tailscale-debug.apk

.gitignore

@@ -35,6 +35,13 @@ tailscale.jks
 .vscode
 .idea
 
+# Native libraries
+*.stripped
+*.unstripped
+
+# Debug symbols
+*.debug
+
 libtailscale.aar
 libtailscale-sources.jar
 .DS_Store

Makefile

@@ -13,10 +13,14 @@
 DOCKER_IMAGE=tailscale-android-build-amd64-191124
 export TS_USE_TOOLCHAIN=1
 
+NDK_ROOT := $(ANDROID_HOME)/ndk/23.1.7779620
+STRIP_TOOL := $(NDK_ROOT)/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objcopy
+
 DEBUG_APK=tailscale-debug.apk
 RELEASE_AAB=tailscale-release.aab
 RELEASE_TV_AAB=tailscale-tv-release.aab
 LIBTAILSCALE=android/libs/libtailscale.aar
+UNSTRIPPED_LIB = $(LIBTAILSCALE:.aar=_unstripped.aar)
 # Extract the version code from build.gradle.
 ifeq ($(shell uname),Linux)
 	ANDROID_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip"
@@ -89,8 +93,33 @@ export GOROOT := # Unset
 # Android Builds:
 #
 
+.PHONY: print-info
+print-info:
+	@echo "Running: $(shell uname -a)"
+	@echo "CI environment: $$CI"
+	@echo "Runner OS: $$RUNNER_OS"
+
+.PHONY: print-working-dir
+print-working-dir:
+    @echo "Current directory: $(shell pwd)"
+
+.PHONY: debug-unstripped
+debug-unstripped: $(UNSTRIPPED_AAR)
+	@echo "Contents of android/libs:"; ls -l android/libs
+
+
+.PHONY: print-aar-contents
+print-aar-contents: $(UNSTRIPPED_AAR)
+	@echo "Contents of $(UNSTRIPPED_AAR):"
+	unzip -l $(UNSTRIPPED_AAR)
+
+.PHONY: list-android-libs
+list-android-libs: android/libs
+	@echo "Listing contents of android/libs:"
+	ls -l android/libs
+
 .PHONY: apk
-apk: $(DEBUG_APK) ## Build the debug APK
+	apk: $(DEBUG_APK) ## Build the debug APK
 
 .PHONY: tailscale-debug
 tailscale-debug: $(DEBUG_APK) ## Build the debug APK
@@ -109,7 +138,7 @@ release-tv: jarsign-env $(RELEASE_TV_AAB) ## Build the release AAB
 .PHONY: gradle-dependencies
 gradle-dependencies: $(shell find android -type f -not -path "android/build/*" -not -path '*/.*') $(LIBTAILSCALE) tailscale.version
 
-$(DEBUG_APK): version gradle-dependencies
+$(DEBUG_APK): libtailscale debug-symbols version gradle-dependencies print-aar-contents
 	(cd android && ./gradlew test assembleDebug)
 	install -C android/build/outputs/apk/debug/android-debug.apk $@
 
@@ -128,7 +157,7 @@ tailscale-test.apk: version gradle-dependencies
 	install -C ./android/build/outputs/apk/androidTest/applicationTest/android-applicationTest-androidTest.apk $@
 
 tailscale.version: go.mod go.sum $(wildcard .git/HEAD)
-    $(shell ./tool/go run tailscale.com/cmd/mkversion > tailscale.version)
+	@bash -c "./tool/go run tailscale.com/cmd/mkversion > tailscale.version"
 
 .PHONY: version
 version: tailscale.version ## print the current version information
@@ -147,14 +176,61 @@ $(GOBIN)/gomobile: $(GOBIN)/gobind go.mod go.sum
 $(GOBIN)/gobind: go.mod go.sum
 	./tool/go install golang.org/x/mobile/cmd/gobind
 
-$(LIBTAILSCALE): Makefile android/libs $(shell find libtailscale -name *.go) go.mod go.sum $(GOBIN)/gomobile tailscale.version
+LIBTAILSCALE_AAR := android/libs/libtailscale.aar
+UNSTRIPPED_AAR := android/libs/libtailscale_unstripped.aar
+ARM64_SO_PATH := jni/arm64-v8a/libgojni.so
+
+# Build the unstripped AAR.
+$(UNSTRIPPED_AAR): Makefile android/libs $(shell find libtailscale -name *.go) go.mod go.sum $(GOBIN)/gomobile tailscale.version
 	$(GOBIN)/gomobile bind -target android -androidapi 26 \
 		-tags "$$(./build-tags.sh)" \
-		-ldflags "-w $$(./version-ldflags.sh)" \
+		-ldflags "$$(./version-ldflags.sh)" \
 		-o $@ ./libtailscale
+	@echo "Generated unstripped AAR: $@"
+
+# Extract the .so file from the unstripped AAR.
+libgojni.so.unstripped:
+	@echo "Extracting libgojni.so from unstripped AAR..."
+	@if unzip -p $(UNSTRIPPED_AAR) "jni/arm64-v8a/libgojni.so" > libgojni.so.unstripped; then \
+	    echo "Found arm64-v8a libgojni.so"; \
+	elif unzip -p $(UNSTRIPPED_AAR) "jni/armeabi-v7a/libgojni.so" > libgojni.so.unstripped; then \
+	    echo "Found armeabi-v7a libgojni.so"; \
+	else \
+	    echo "Neither 'jni/arm64-v8a/libgojni.so' nor 'jni/armeabi-v7a/libgojni.so' was found."; \
+	    echo "Listing contents of $(UNSTRIPPED_AAR):"; \
+	    unzip -l $(UNSTRIPPED_AAR); \
+	    exit 1; \
+	fi
+
+# Generate the debug symbol file from the extracted .so file.
+libgojni.so.debug: libgojni.so.unstripped
+	@echo "Extracting debug symbols from libgojni.so..."
+	$(STRIP_TOOL) --only-keep-debug libgojni.so.unstripped libgojni.so.debug
+
+# Generate the stripped .so file from the extracted file.
+libgojni.so.stripped: libgojni.so.unstripped
+	@echo "Stripping debug symbols from libgojni.so..."
+	$(STRIP_TOOL) --strip-debug libgojni.so.unstripped libgojni.so.stripped
+
+# Repackage the AAR with the stripped .so file.
+$(LIBTAILSCALE_AAR): libgojni.so.stripped $(UNSTRIPPED_AAR)
+	@echo "Repackaging AAR with stripped libgojni.so..."
+	rm -rf temp_aar
+	mkdir temp_aar
+	unzip $(UNSTRIPPED_AAR) -d temp_aar
+	cp libgojni.so.stripped temp_aar/$(ARM64_SO_PATH)
+	(cd temp_aar && zip -r ../$(LIBTAILSCALE_AAR) .)
+	rm -rf temp_aar
 
 .PHONY: libtailscale
-libtailscale: $(LIBTAILSCALE) ## Build the libtailscale AAR
+libtailscale: $(LIBTAILSCALE_AAR) ## Build the stripped libtailscale AAR
+
+.PHONY: debug-symbols
+debug-symbols: libgojni.so.debug
+
+.PHONY: all
+all: libtailscale debug-symbols
+	@echo "Build complete: Stripped AAR is $(LIBTAILSCALE_AAR) and debug symbols are in libgojni.so.debug"
 
 #
 # Utility tasks:
@@ -195,7 +271,7 @@ androidpath:
 	@echo 'export PATH=$(ANDROID_HOME)/cmdline-tools/latest/bin:$(ANDROID_HOME)/platform-tools:$$PATH'
 
 .PHONY: tag_release
-tag_release: tailscale.version ## Tag the current commit with the current version
+tag_release: debug-symbols tailscale.version ## Tag the current commit with the current version and generate debug symbols
 	source tailscale.version && git tag -a "$${VERSION_LONG}" -m "OSS and Version updated to $${VERSION_LONG}"