android: update connlib dependency and integration (#1752)

- Replaced connlib dependency to use `rust/connlib/clients/android/lib`
project
- Added `rust-android-gradle` to android project
- Set the `cargo build` target directory to
`rust/connlib/clients/android/lib/build/cargo-target`
- Moved `logger`, `session`, and `vpn` classes to their independent
packages.
- Added `SessionCallback` contract for the session callbacks.

---------

Signed-off-by: Pratik Velani <pratikvelani@gmail.com>
Co-authored-by: Jamil <jamilbk@users.noreply.github.com>

.github/workflows/kotlin.yml

@@ -16,53 +16,38 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  kotlin_draft-release:
-    runs-on: ubuntu-latest
-    outputs:
-      tag_name: ${{ steps.release_drafter.outputs.tag_name }}
-    steps:
-      - uses: release-drafter/release-drafter@v5
-        with:
-          commitish: main
-        id: release_drafter
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  # TODO: Add a basic CI for the Android client
   # See rust.yml how we build, package and release connlib as an example
   kotlin_build:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./kotlin
-    needs:
-      - kotlin_draft-release
+        working-directory: ./kotlin/android
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
-          distribution: 'adopt'
-      # TODO: Is this relevant for the Android client?
-      # - name: Validate Gradle wrapper
-      #   uses: gradle/wrapper-validation-action@v1
-      # - uses: actions/cache@v3
-      #   with:
-      #     path: |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
-      # - name: Assemble Release
-      #   uses: gradle/gradle-build-action@v2
-      #   with:
-      #     arguments: build assembleRelease
-      # - name: Move artifact
-      #   run: |
-      #     mv ./rust/connlib/clients/android/lib/build/outputs/aar/lib-release.aar ./connlib-${{ needs.draft-release.outputs.tag_name }}.aar
-      # - uses: actions/upload-artifact@v3
-      #   with:
-      #     name: connlib-android
-      #     path: |
-      #       ./connlib-${{ needs.draft-release.outputs.tag_name }}.aar
+          distribution: temurin
+          java-version: 11
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Create Local Properties File
+        run: touch local.properties
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          build-root-directory: ./kotlin/android
+      - name: Execute Gradle build
+        run: ./gradlew build
+      - name: Run Test
+        run: ./gradlew testReleaseUnitTest
+      - name: Android Test Report
+        uses: asadmansr/android-test-report-action@v1.2.0
+        if: ${{ always() }} # IMPORTANT: run Android Test Report regardless

.github/workflows/rust.yml

@@ -82,40 +82,6 @@ jobs:
       - run: cargo clippy --all-targets --all-features -- -D warnings
       - run: cargo test --all-features
 
-  rust_build-android:
-    needs:
-      - rust_draft-release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v3
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: ./rust
-      - name: Update toolchain
-        run: rustup show
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-          cache: gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: Assemble Release
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build assembleRelease
-          build-root-directory: rust/connlib/clients/android
-      - name: Move artifact
-        run: |
-          mv ./connlib/clients/android/lib/build/outputs/aar/lib-release.aar ./connlib-${{ needs.draft-release.outputs.tag_name }}.aar
-      - uses: actions/upload-artifact@v3
-        with:
-          name: connlib-android
-          path: |
-            ./rust/connlib-${{ needs.draft-release.outputs.tag_name }}.aar
-
   rust_cross-compile-relay: # cross is separate from test because cross-compiling yields different artifacts and we cannot reuse the cache.
     runs-on: ubuntu-latest
     steps:

kotlin/android/app/build.gradle

@@ -62,7 +62,7 @@ dependencies {
     def core_version = "1.9.0"
 
     // Connlib
-    implementation "dev.firezone:connlib:0.1.6"
+    implementation project(path: ':connlib')
 
     // AndroidX
     implementation "androidx.core:core-ktx:$core_version"

kotlin/android/app/src/main/java/dev/firezone/android/features/session/backend/SessionCallbackImpl.kt

@@ -0,0 +1,26 @@
+package dev.firezone.android.features.session.backend
+
+import android.util.Log
+import dev.firezone.connlib.SessionCallback
+
+class SessionCallbackImpl: SessionCallback {
+
+    override fun onConnect(addresses: String): Boolean {
+        Log.d("Connlib", "onConnect: $addresses")
+
+        return true
+    }
+
+    override fun onUpdateResources(resources: String): Boolean {
+        // TODO: Call into client app to update resources list and routing table
+        Log.d("Connlib", "onUpdateResources: $resources")
+
+        return true
+    }
+
+    override fun onDisconnect(): Boolean {
+        Log.d("Connlib", "onDisconnect")
+
+        return true
+    }
+}

kotlin/android/app/src/main/java/dev/firezone/android/features/session/backend/SessionCallbacks.kt

@@ -1,19 +0,0 @@
-package dev.firezone.android.features.session.backend
-
-import android.util.Log
-
-public object SessionCallbacks {
-    public fun onUpdateResources(resources: String): Boolean {
-        // TODO: Call into client app to update resources list and routing table
-        Log.d("Connlib", "onUpdateResources: $resources")
-
-        return true
-    }
-
-    public fun onSetTunnelAddresses(addresses: String): Boolean {
-        // TODO: // Call into client app to update interface addresses
-        Log.d("Connlib", "onSetTunnelAddresses: $addresses")
-
-        return true
-    }
-}

kotlin/android/app/src/main/java/dev/firezone/android/features/session/backend/SessionManager.kt

@@ -2,8 +2,8 @@ package dev.firezone.android.features.session.backend
 
 import android.content.SharedPreferences
 import android.util.Log
-import dev.firezone.connlib.Session
 import dev.firezone.connlib.Logger
+import dev.firezone.connlib.Session
 import javax.inject.Inject
 
 private const val PORTAL_URL_KEY = "portalUrl"
@@ -12,14 +12,7 @@ private const val AUTH_TOKEN_KEY = "authToken"
 internal class SessionManager @Inject constructor(
     private val sharedPreferences: SharedPreferences
 ) {
-    internal companion object {
-        var sessionPtr: Long? = null
-        init {
-            System.loadLibrary("connlib")
-            Logger.init()
-            Log.d("Connlib","Library loaded from main app!")
-        }
-    }
+    private val callback: SessionCallbackImpl = SessionCallbackImpl()
 
     fun connect() {
         val portalUrl = sharedPreferences.getString(PORTAL_URL_KEY, null)
@@ -31,7 +24,7 @@ internal class SessionManager @Inject constructor(
             sessionPtr = Session.connect(
                 portalUrl!!,
                 portalToken!!,
-                SessionCallbacks
+                callback
             )
             setConnectionStatus(true)
         } catch (exception: Exception) {
@@ -51,4 +44,13 @@ internal class SessionManager @Inject constructor(
     private fun setConnectionStatus(value: Boolean) {
         sharedPreferences.edit().putBoolean("isConnected", value).apply()
     }
+
+    internal companion object {
+        var sessionPtr: Long? = null
+        init {
+            System.loadLibrary("connlib")
+            Logger.init()
+            Log.d("Connlib","Library loaded from main app!")
+        }
+    }
 }

kotlin/android/build.gradle

@@ -4,6 +4,9 @@ buildscript {
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
@@ -11,6 +14,7 @@ buildscript {
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44.1'
         classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
+        classpath 'org.mozilla.rust-android-gradle:plugin:0.9.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

kotlin/android/settings.gradle

@@ -6,22 +6,14 @@ pluginManagement {
     }
 }
 
-Properties properties = new Properties()
-properties.load(new FileInputStream(new File('local.properties')))
-
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
-        maven {
-            url = uri('https://maven.pkg.github.com/firezone/connlib')
-            credentials {
-                username = properties.getProperty("githubUser") ?: System.getenv("USERNAME")
-                password = properties.getProperty("githubToken") ?: System.getenv("TOKEN")
-            }
-        }
         mavenCentral()
     }
 }
 rootProject.name = "Firezone App"
 include ':app'
+include ':connlib'
+project(':connlib').projectDir=new File('../../rust/connlib/clients/android/connlib')

rust/connlib/.gitignore

@@ -161,6 +161,9 @@ fabric.properties
 
 !clients/android/gradle/wrapper/gradle-wrapper.jar
 
+### JNI
+jniLibs/
+
 ### Apple ###
 .build/
 DerivedData/

rust/connlib/clients/android/build.gradle.kts

@@ -1,9 +0,0 @@
-plugins {
-    id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3"
-    id("com.android.library") version "7.4.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.7.21" apply false
-}
-
-tasks.register("clean",Delete::class) {
-    delete(rootProject.buildDir)
-}

rust/connlib/clients/android/connlib/build.gradle.kts

@@ -3,33 +3,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("org.jetbrains.kotlin.android")
-    `maven-publish`
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            create<MavenPublication>("release") {
-                groupId = "dev.firezone"
-                artifactId = "connlib"
-                version = "0.1.6"
-                from(components["release"])
-            }
-        }
-    }
-}
-
-publishing {
-    repositories {
-        maven {
-            url = uri("https://maven.pkg.github.com/firezone/connlib")
-            name = "GitHubPackages"
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
 }
 
 android {
@@ -64,6 +37,9 @@ android {
     publishing {
         singleVariant("release")
     }
+    sourceSets["main"].jniLibs {
+        srcDir("jniLibs")
+    }
 }
 
 dependencies {
@@ -79,6 +55,36 @@ dependencies {
 
 apply(plugin = "org.mozilla.rust-android-gradle.rust-android")
 
+fun copyJniShared(task: Task, buildType: String) = task.apply {
+    outputs.upToDateWhen { false }
+
+    val jniTargets = mapOf(
+        "armv7-linux-androideabi" to "armeabi-v7a",
+        "aarch64-linux-android" to "arm64-v8a",
+        "i686-linux-android" to "x86",
+        "x86_64-linux-android" to "x86_64",
+    )
+
+    jniTargets.forEach { entry ->
+        val soFile = File(
+            project.projectDir.parentFile.parentFile.parentFile.parentFile,
+            "target/${entry.key}/${buildType}/libconnlib.so"
+        )
+        val targetDir = File(project.projectDir, "/jniLibs/${entry.value}").apply {
+            if (!exists()) {
+                mkdirs()
+            }
+        }
+
+        copy {
+            with(copySpec {
+                from(soFile)
+            })
+            into(targetDir)
+        }
+    }
+}
+
 cargo {
     prebuiltToolchains = true
     verbose = true
@@ -92,8 +98,24 @@ cargo {
     }
 }
 
+tasks.register("copyJniSharedObjectsDebug") {
+    copyJniShared(this, "debug")
+}
+
+tasks.register("copyJniSharedObjectsRelease") {
+    copyJniShared(this, "release")
+}
+
 tasks.whenTaskAdded {
     if (name.startsWith("javaPreCompile")) {
-        dependsOn(tasks.named("cargoBuild"))
+        val newTasks = arrayOf (
+            tasks.named("cargoBuild"),
+            if (name.endsWith("Debug")) {
+                tasks.named("copyJniSharedObjectsDebug")
+            } else {
+                tasks.named("copyJniSharedObjectsRelease")
+            }
+        )
+        dependsOn(*newTasks)
     }
 }

rust/connlib/clients/android/connlib/src/main/java/dev/firezone/connlib/Logger.kt

@@ -0,0 +1,5 @@
+package dev.firezone.connlib
+
+object Logger {
+    external fun init()
+}

rust/connlib/clients/android/connlib/src/main/java/dev/firezone/connlib/Session.kt

@@ -0,0 +1,6 @@
+package dev.firezone.connlib
+
+object Session {
+    external fun connect(portalURL: String, token: String, callback: Any): Long
+    external fun disconnect(session: Long): Boolean
+}

rust/connlib/clients/android/connlib/src/main/java/dev/firezone/connlib/SessionCallback.kt

@@ -0,0 +1,10 @@
+package dev.firezone.connlib
+
+interface SessionCallback {
+
+    fun onConnect(addresses: String): Boolean
+
+    fun onUpdateResources(resources: String): Boolean
+
+    fun onDisconnect(): Boolean
+}

rust/connlib/clients/android/connlib/src/main/java/dev/firezone/connlib/VpnService.kt

@@ -1,18 +1,18 @@
 package dev.firezone.connlib
 import android.util.Log
 
-public class VpnService : android.net.VpnService() {
-    public override fun onCreate() {
+class VpnService : android.net.VpnService() {
+    override fun onCreate() {
         super.onCreate()
         Log.d("Connlib", "VpnService.onCreate")
     }
 
-    public override fun onDestroy() {
+    override fun onDestroy() {
         super.onDestroy()
         Log.d("Connlib", "VpnService.onDestroy")
     }
 
-    public override fun onStartCommand(intent: android.content.Intent?, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: android.content.Intent?, flags: Int, startId: Int): Int {
         Log.d("Connlib", "VpnService.onStartCommand")
         return super.onStartCommand(intent, flags, startId)
     }

rust/connlib/clients/android/gradle.properties

@@ -1,3 +0,0 @@
-android.useAndroidX=true
-kotlin.code.style=official
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

rust/connlib/clients/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
-networkTimeout=10000
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

rust/connlib/clients/android/gradlew

@@ -1,244 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

rust/connlib/clients/android/gradlew.bat

@@ -1,92 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

rust/connlib/clients/android/lib/src/main/java/dev/firezone/connlib/Logger.kt

@@ -1,5 +0,0 @@
-package dev.firezone.connlib
-
-public object Logger {
-    public external fun init()
-}

rust/connlib/clients/android/lib/src/main/java/dev/firezone/connlib/Session.kt

@@ -1,8 +0,0 @@
-package dev.firezone.connlib
-
-public object Session {
-    public external fun connect(portalURL: String, token: String, callback: Any): Long
-    public external fun disconnect(session: Long): Boolean
-    public external fun bumpSockets(session: Long): Boolean
-    public external fun disableSomeRoamingForBrokenMobileSemantics(session: Long): Boolean
-}

rust/connlib/clients/android/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

rust/connlib/clients/android/settings.gradle.kts

@@ -1,17 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-}
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-rootProject.name = "Connlib"
-include(":lib")