build updates

veilid-core/Cargo.toml

@@ -14,7 +14,7 @@ default = []
 rt-async-std = [ "async-std", "async-std-resolver", "async_executors/async_std", "rtnetlink?/smol_socket", "veilid-tools/rt-async-std" ]
 rt-tokio = [ "tokio", "tokio-util", "tokio-stream", "trust-dns-resolver/tokio-runtime", "async_executors/tokio_tp", "async_executors/tokio_io", "async_executors/tokio_timer", "rtnetlink?/tokio_socket", "veilid-tools/rt-tokio" ]
 
-keyring_manager_android_tests = []
+veilid_core_android_tests = []
 veilid_core_ios_tests = [ "simplelog" ]
 tracking = []
 
@@ -128,8 +128,8 @@ features = [
 [target.'cfg(target_os = "android")'.dependencies]
 jni = "^0"
 jni-sys = "^0"
-ndk = { version = "^0", features = ["trace"] }
-ndk-glue = { version = "^0", features = ["logger"] }
+ndk = { version = "^0.7" }
+ndk-glue = { version = "^0.7", features = ["logger"] }
 tracing-android = { version = "^0" }
 
 # Dependenices for all Unix (Linux, Android, MacOS, iOS)

veilid-core/src/tests/android/.idea/.name

@@ -1 +1 @@
-VeilidCore Tests
+Veilid-Core Tests

veilid-core/src/tests/android/app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+    buildToolsVersion "33.0.1"
 
     defaultConfig {
         applicationId "com.veilid.veilid_core_android_tests"
@@ -43,6 +43,7 @@ android {
     // Required to copy libc++_shared.so
     externalNativeBuild {
         cmake {
+            version '3.22.1'
             path file('CMakeLists.txt')
         }
     }
@@ -59,7 +60,7 @@ dependencies {
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
 cargo {
-    module  = "../../../../../veilid-core"
+    module  = "../../../../"
     libname = "veilid_core"
     targets = ["arm", "arm64", "x86", "x86_64"]
     targetDirectory = "../../../../../target"

veilid-core/src/tests/android/app/src/main/AndroidManifest.xml

@@ -12,7 +12,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.VeilidCoreTests">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

veilid-core/src/tests/android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
 }
 
 plugins {
-    id "org.mozilla.rust-android-gradle.rust-android" version "0.9.0"
+    id "org.mozilla.rust-android-gradle.rust-android" version "0.9.3"
 }
 
 allprojects {

veilid-core/src/tests/android/settings.gradle

@@ -1,2 +1,2 @@
 include ':app'
-rootProject.name = "VeilidCore Tests"
+rootProject.name = "Veilid-Core Tests"