archive
/
tailscale-android
mirror of https://github.com/tailscale/tailscale-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build.gradle, Makefile: update build for new app

Browse Source 
Have build.gradle handle different oses and environments

Updates tailscale/corp#18202

Signed-off-by: kari-ts <kari@tailscale.com>
kari/newbuild
kari-ts 2 months ago
parent f010d2375b
commit 9eff7e1aba
6 changed files with 53 additions and 127 deletions
Show Stats Download Patch File Download Diff File

10
Makefile
Unescape Escape View File

@ -157,19 +157,19 @@ run: install
# This is useful for testing on e.g. Amazon Fire Stick devices.
tailscale-fdroid.apk: $(AAR)
(cd android_legacy && ./gradlew test assembleFdroidDebug)
mv android_legacy/build/outputs/apk/fdroid/debug/android_legacy-fdroid-debug.apk $@
install -C android_legacy/build/outputs/apk/fdroid/debug/android_legacy-fdroid-debug.apk $@
tailscale-new-fdroid.apk: $(AAR)
(cd android && ./gradlew test assembleFdroidDebug)
mv android/build/outputs/apk/fdroid/debug/android-fdroid-debug.apk $@
install -C android/build/outputs/apk/fdroid/debug/android-fdroid-debug.apk $@
tailscale-new-debug.apk:
(cd android && ./gradlew test buildAllGoLibs assemblePlayDebug)
mv android/build/outputs/apk/play/debug/android-play-debug.apk $@
(cd android && ./gradlew test assemblePlayDebug)
install -C android/build/outputs/apk/play/debug/android-play-debug.apk $@
$(RELEASE_AAB): $(AAR)
(cd android_legacy && ./gradlew test bundlePlayRelease)
mv ./android_legacy/build/outputs/bundle/playRelease/android-play-release.aab $@
install -C ./android_legacy/build/outputs/bundle/playRelease/android-play-release.aab $@
release: $(RELEASE_AAB)
jarsigner -sigalg SHA256withRSA -digestalg SHA-256 -keystore $(KEYSTORE) $(RELEASE_AAB) $(KEYSTORE_ALIAS)

97
android/build.gradle
Unescape Escape View File

@ -16,15 +16,15 @@ buildscript {
repositories {
google()
mavenCentral()
flatDir {
dirs 'libs'
}
}
apply plugin: 'kotlin-android'
apply plugin: 'com.android.application'
apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
def ndkLevel = 30
def targets = [ "aarch64-linux-android", "armv7a-linux-androideabi", "i686-linux-android", "x86_64-linux-android" ]
android {
ndkVersion "23.1.7779620"
compileSdkVersion 34
@ -55,6 +55,11 @@ android {
}
}
namespace 'com.tailscale.ipn'
sourceSets {
main {
jniLibs.srcDirs = ['src/main/jniLibs']
}
}
}
dependencies {
@ -96,7 +101,7 @@ dependencies {
implementation("io.coil-kt:coil-compose:1.3.1")
// Tailscale dependencies.
implementation ':ipn@aar'
//implementation ':ipn@aar'
// Tests
testImplementation "junit:junit:4.12"
@ -106,61 +111,47 @@ dependencies {
playImplementation 'com.google.android.gms:play-services-auth:20.7.0'
}
def ndkPath = project.hasProperty('ndkPath') ? project.property('ndkPath') : System.getenv('ANDROID_SDK_ROOT')
task checkNDK {
doFirst {
if (ndkPath == null) {
throw new GradleException('NDK path not found. Please define ndkPath in local.properties or ANDROID_SDK_HOME environment variable.')
}
}
}
task buildGoLibArm64(type: Exec) {
inputs.dir '../pkg/tailscale'
outputs.file 'src/main/jniLibs/arm64-v8a/libtailscale.so'
environment "CC", "$ndkPath/ndk-bundle/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android30-clang"
commandLine 'sh', '-c', "GOOS=android GOARCH=arm64 CGO_ENABLED=1 go build -buildmode=c-shared -ldflags=-w -o src/main/jniLibs/arm64-v8a/libtailscale.so ../pkg/tailscale"
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
OperatingSystem os = DefaultNativePlatform.currentOperatingSystem
def hostTag
if (os.isLinux()) {
// No aarch64 prebuilts
hostTag = "linux-x86_64"
} else if (os.isMacOsX()) {
hostTag = "darwin-x86_64"
} else if (os.isWindows()){
// No aarch64 prebuilts.
hostTag = "windows-x86_64"
} else {
throw new GradleException("Unsupported host OS: $os")
}
task buildGoLibArmeabi(type: Exec) {
inputs.dir '../pkg/tailscale'
outputs.file 'src/main/jniLibs/armeabi-v7a/libtailscale.so'
environment "CC", "$ndkPath/ndk-bundle/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi30-clang"
commandLine 'sh', '-c', "GOOS=android GOARCH=arm CGO_ENABLED=1 go build -buildmode=c-shared -ldflags=-w -o src/main/jniLibs/armeabi-v7a/libtailscale.so ../pkg/tailscale"
}
def toolchainDir = "${android.ndkDirectory}/toolchains/llvm/prebuilt/${hostTag}"
task buildGoLibX86(type: Exec) {
inputs.dir '../pkg/tailscale'
outputs.file 'src/main/jniLibs/x86/libtailscale.so'
environment "CC", "$ndkPath/ndk-bundle/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android30-clang"
commandLine 'sh', '-c', "GOOS=android GOARCH=386 CGO_ENABLED=1 go build -buildmode=c-shared -ldflags=-w -o src/main/jniLibs/x86/libtailscale.so ../pkg/tailscale"
}
def targetToGoArch = [
"aarch64-linux-android": "arm64",
"armv7a-linux-androideabi": "arm",
"i686-linux-android": "386",
"x86_64-linux-android": "amd64"
]
task buildGoLibX86_64(type: Exec) {
inputs.dir '../pkg/tailscale'
outputs.file 'src/main/jniLibs/x86_64/libtailscale.so'
environment "CC", "$ndkPath/ndk-bundle/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android30-clang"
commandLine 'sh', '-c', "GOOS=android GOARCH=amd64 CGO_ENABLED=1 go build -buildmode=c-shared -ldflags=-w -o src/main/jniLibs/x86_64/libtailscale.so ../pkg/tailscale"
}
def targetToAbi = [
"aarch64-linux-android": "arm64-v8a",
"armv7a-linux-androideabi": "armeabi-v7a",
"i686-linux-android": "x86",
"x86_64-linux-android": "x86_64"
]
task buildAllGoLibs {
dependsOn checkNDK, buildGoLibArm64, buildGoLibArmeabi, buildGoLibX86, buildGoLibX86_64
}
assemble.dependsOn buildAllGoLibs
task cleanGoLibs(type: Delete) {
delete 'src/main/jniLibs/arm64-v8a/libtailscale.so',
'src/main/jniLibs/armeabi-v7a/libtailscale.so',
'src/main/jniLibs/x86/libtailscale.so',
'src/main/jniLibs/x86_64/libtailscale.so'
}
targets.each { target ->
tasks.create("jniLib-$target", Exec) {
environment "CC", "${toolchainDir}/bin/$target$ndkLevel-clang"
clean.dependsOn cleanGoLibs
// TODO: use cmd/dist or gocross to get the version tags
def jniLibsDir = "src/main/jniLibs/${targetToAbi[target]}"
commandLine 'sh', '-c', "mkdir -p $jniLibsDir && GOOS=android GOARM=7 GOARCH=${targetToGoArch[target]} CGO_ENABLED=1 go build -buildmode=c-shared -ldflags=\"-w -s\" -o $jniLibsDir/libtailscale.so ../pkg/tailscale"
tasks.whenTaskAdded { task ->
if (task.name.startsWith('merge') && task.name.endsWith('JniLibFolders')) {
task.mustRunAfter buildAllGoLibs
preBuild.dependsOn tasks["jniLib-$target"]
}
}

1
android/src/main/AndroidManifest.xml
Unescape Escape View File

@ -19,7 +19,6 @@
android:name=".App" android:allowBackup="false">
<activity android:name="MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.GioApp"
android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboardHidden"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask"

56
pkg/tailscale/callbacks.go
Unescape Escape View File

@ -4,9 +4,6 @@
package main
import (
"os"
"path/filepath"
"sync"
"unsafe"
jnipkg "github.com/tailscale/tailscale-android/pkg/jni"
@ -140,56 +137,3 @@ func notifyVPNClosed() {
default:
}
}
var android struct {
// mu protects all fields of this structure. However, once a
// non-nil jvm is returned from javaVM, all the other fields may
// be accessed unlocked.
mu sync.Mutex
jvm *jnipkg.JVM
// appCtx is the global Android App context.
appCtx C.jobject
}
func initJVM(env *C.JNIEnv, ctx C.jobject) {
android.mu.Lock()
defer android.mu.Unlock()
jenv := (*jnipkg.Env)(unsafe.Pointer(env))
res, err := jnipkg.GetJavaVM(jenv)
if err != nil {
panic("eror: GetJavaVM failed")
}
android.jvm = res
android.appCtx = C.jobject(jnipkg.NewGlobalRef(jenv, jnipkg.Object(ctx)))
}
//export Java_com_tailscale_ipn_App_initBackend
func Java_com_tailscale_ipn_App_initBackend(env *C.JNIEnv, class C.jclass, jdataDir C.jbyteArray, context C.jobject) {
initJVM(env, context)
jenv := (*jnipkg.Env)(unsafe.Pointer(env))
dirBytes := jnipkg.GetByteArrayElements(jenv, jnipkg.ByteArray(jdataDir))
if dirBytes == nil {
panic("runGoMain: GetByteArrayElements failed")
}
n := jnipkg.GetArrayLength(jenv, jnipkg.ByteArray(jdataDir))
dataDir := C.GoStringN((*C.char)(unsafe.Pointer(&dirBytes[0])), C.int(n))
// Set XDG_CACHE_HOME to make os.UserCacheDir work.
if _, exists := os.LookupEnv("XDG_CACHE_HOME"); !exists {
cachePath := filepath.Join(dataDir, "cache")
os.Setenv("XDG_CACHE_HOME", cachePath)
}
// Set XDG_CONFIG_HOME to make os.UserConfigDir work.
if _, exists := os.LookupEnv("XDG_CONFIG_HOME"); !exists {
cfgPath := filepath.Join(dataDir, "config")
os.Setenv("XDG_CONFIG_HOME", cfgPath)
}
// Set HOME to make os.UserHomeDir work.
if _, exists := os.LookupEnv("HOME"); !exists {
os.Setenv("HOME", dataDir)
}
dataDirChan <- dataDir
main()
}

4
pkg/tailscale/net.go
Unescape Escape View File

@ -340,3 +340,7 @@ func (b *backend) getPlatformDNSConfig() string {
}
return baseConfig
}
func (b *backend) setCfg(rcfg *router.Config, dcfg *dns.OSConfig) error {
return b.settings(rcfg, dcfg)
}

12
pkg/tailscale/tailscale.go
Unescape Escape View File

@ -68,18 +68,6 @@ func fatalErr(err error) {
log.Printf("fatal error: %v", err)
}
func javaVM() uintptr {
android.mu.Lock()
defer android.mu.Unlock()
return uintptr(unsafe.Pointer(android.jvm))
}
func appContext() uintptr {
android.mu.Lock()
defer android.mu.Unlock()
return uintptr(android.appCtx)
}
// osVersion returns android.os.Build.VERSION.RELEASE. " [nogoogle]" is appended
// if Google Play services are not compiled in.
func (a *App) osVersion() string {

Write Preview
Loading…
Cancel
Save