fix source build

nym-vpn-android/nym-vpn-client/build.gradle.kts

@@ -17,13 +17,14 @@ android {
  if(!project.hasProperty(Constants.CORE_BUILD_PROP)) return@runCatching
  val coreBuild = project.property(Constants.CORE_BUILD_PROP) as String
  if (Regex("^v\\d+\\.\\d+\\.\\d+\$").matches(coreBuild)) {
+ //TODO how do we get bindings for this
  tasks.register<DownloadCoreTask>(Constants.DOWNLOAD_LIB_TASK) {
  tag = coreBuild
  extractPath = "/nym-vpn-client/src/main/jniLibs/arm64-v8a"
  }
- tasks.getByName(Constants.DOWNLOAD_LIB_TASK).finalizedBy(Constants.GENERATE_BINDINGS_TASK)
+ tasks.getByName(Constants.DOWNLOAD_LIB_TASK)
  tasks.preBuild.dependsOn(Constants.DOWNLOAD_LIB_TASK)
- }
+ } else tasks.preBuild.dependsOn(Constants.BUILD_SOURCE_TASK)
  }.onFailure {
  tasks.preBuild.dependsOn(Constants.BUILD_SOURCE_TASK)
  }
@@ -117,24 +118,18 @@ tasks.named<Delete>(Constants.CLEAN_TASK) {
  removeJniLibsFile(Constants.WG_SHARED_LIB)
 }
 
-tasks.register<Exec>(Constants.BUILD_SOURCE_TASK) {
+tasks.register(Constants.BUILD_SOURCE_TASK) {
  dependsOn(Constants.CLEAN_TASK)
- val ndkPath = android.sdkDirectory.resolve("ndk").listFilesOrdered().lastOrNull()?.path ?: System.getenv("ANDROID_NDK_HOME")
- commandLine("echo", "NDK HOME: $ndkPath")
- val script = "${projectDir.path}/src/main/scripts/build-libs.sh"
- commandLine("bash").args(script, ndkPath)
+ exec {
+ val ndkPath = android.sdkDirectory.resolve("ndk").listFilesOrdered().lastOrNull()?.path ?: System.getenv("ANDROID_NDK_HOME")
+ commandLine("echo", "NDK HOME: $ndkPath")
+ val script = "${projectDir.path}/src/main/scripts/build-libs.sh"
+ commandLine("bash").args(script, ndkPath)
+ }
 }
 
-tasks.register<Exec>(Constants.GENERATE_BINDINGS_TASK) {
- dependsOn()
- val script = "${projectDir.path}/src/main/scripts/generate-bindings.sh"
- commandLine("bash").args(script)
-}
 
 tasks.register<Exec>(Constants.GENERATE_LICENSES_TASK) {
  val script = "${projectDir.path}/src/main/scripts/generate-licenses.sh"
  commandLine("bash").args(script)
 }
-
-tasks.getByName(Constants.BUILD_SOURCE_TASK).finalizedBy(Constants.GENERATE_BINDINGS_TASK)
-tasks.getByName(Constants.GENERATE_BINDINGS_TASK).finalizedBy(Constants.GENERATE_LICENSES_TASK)

nym-vpn-android/nym-vpn-client/src/main/scripts/build-libs.sh

@@ -18,6 +18,9 @@ case "$(uname -s)" in
  MINGW*|MSYS_NT*) export RUSTFLAGS="-L ${PWD}/../../build/lib/aarch64-linux-android -L ${PWD}/../../build/lib/x86_64-pc-windows-msvc";;
 esac
 
+(cd $PWD/../../nym-vpn-core; cargo run --bin uniffi-bindgen generate --library ./target/aarch64-linux-android/release/libnym_vpn_lib.so --language kotlin --out-dir ../nym-vpn-android/nym-vpn-client/src/main/java/net/nymtech/vpn -n)
+cargo license -j --avoid-dev-deps --current-dir ../../nym-vpn-core/crates/nym-vpn-lib --filter-platform aarch64-linux-android --avoid-build-deps > ./src/main/assets/licenses_rust.json
+
 #fix emulators later
 #(cd $PWD/src/tools/nym-vpn-client/crates/nym-vpn-lib; cargo ndk -t armeabi-v7a -t arm64-v8a -t i686-linux-android -t x86_64-linux-android -o ../../../main/jniLibs build --release)
 (cd $PWD/../../nym-vpn-core/crates/nym-vpn-lib; cargo ndk -t arm64-v8a -o ../../../nym-vpn-android/nym-vpn-client/src/main/jniLibs build --release)