From edc87cd78ed5fae557404e8d1d1b78f584179da7 Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 30 Nov 2022 16:15:54 -0500 Subject: [PATCH] build updates --- Cargo.lock | 61 ++++--------------- Cargo.toml | 2 +- external/keyring-manager | 2 +- scripts/earthly/cargo-android/config.toml | 8 +-- veilid-core/Cargo.toml | 6 +- veilid-core/src/tests/android/.idea/.name | 2 +- .../src/tests/android/app/build.gradle | 5 +- .../android/app/src/main/AndroidManifest.xml | 3 +- veilid-core/src/tests/android/build.gradle | 2 +- veilid-core/src/tests/android/settings.gradle | 2 +- veilid-tools/Cargo.toml | 4 +- 11 files changed, 30 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0376e818..eb62b7c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -737,9 +737,9 @@ checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "capnp" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4929d71efc55aa42759793d853ecdfa6bb034419d22884e3e9871f0f593ac8d" +checksum = "afaa14ddcf4553e700608c1c0ee3ca1f4cf673470462b99ff6dd6bedcdb6c6ce" [[package]] name = "capnp-futures" @@ -2630,11 +2630,8 @@ dependencies = [ name = "keyring-manager" version = "0.5.0" dependencies = [ - "android_logger", - "backtrace", "byteorder", "cfg-if 1.0.0", - "clap", "core-foundation 0.9.3", "core-foundation-sys 0.8.3", "directories", @@ -2643,18 +2640,14 @@ dependencies = [ "keychain-services", "lazy_static", "log", - "ndk 0.6.0", + "ndk", "ndk-glue", - "rpassword 5.0.1", "secret-service", "security-framework", "security-framework-sys", "serde", "serde_cbor", - "serial_test", - "simplelog 0.12.0", "snailquote", - "tempfile", "winapi 0.3.9", ] @@ -3019,19 +3012,6 @@ dependencies = [ "socket2", ] -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys 0.3.0", - "num_enum", - "thiserror", -] - [[package]] name = "ndk" version = "0.7.0" @@ -3040,7 +3020,7 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags", "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", + "ndk-sys", "num_enum", "raw-window-handle", "thiserror", @@ -3061,10 +3041,10 @@ dependencies = [ "android_logger", "libc", "log", - "ndk 0.7.0", + "ndk", "ndk-context", "ndk-macro", - "ndk-sys 0.4.1+23.1.7779620", + "ndk-sys", "once_cell", "parking_lot 0.12.1", ] @@ -3082,15 +3062,6 @@ dependencies = [ "syn", ] -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -4239,16 +4210,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "rpassword" version = "6.0.1" @@ -5204,9 +5165,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -5787,7 +5748,7 @@ dependencies = [ "lazy_static", "libc", "maplit", - "ndk 0.6.0", + "ndk", "ndk-glue", "nix 0.26.1", "once_cell", @@ -5895,7 +5856,7 @@ dependencies = [ "opentelemetry-otlp", "opentelemetry-semantic-conventions", "parking_lot 0.12.1", - "rpassword 6.0.1", + "rpassword", "serde", "serde_derive", "serde_yaml", @@ -5935,7 +5896,7 @@ dependencies = [ "libc", "log", "maplit", - "ndk 0.6.0", + "ndk", "ndk-glue", "nix 0.26.1", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index 6ea5de42..27fc702e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ "veilid-wasm", ] -exclude = [ "./external/keyring-rs", "./external/netlink", "./external/cursive", "./external/hashlink" ] +exclude = [ "./external/keyring-manager", "./external/netlink", "./external/cursive", "./external/hashlink" ] [patch.crates-io] cursive = { path = "./external/cursive/cursive" } diff --git a/external/keyring-manager b/external/keyring-manager index 1655f89c..b127b2d3 160000 --- a/external/keyring-manager +++ b/external/keyring-manager @@ -1 +1 @@ -Subproject commit 1655f89cf2ec70900c520080819d76ffad90adee +Subproject commit b127b2d3c653fea163a776dd58b3798f28aeeee3 diff --git a/scripts/earthly/cargo-android/config.toml b/scripts/earthly/cargo-android/config.toml index 88522ce8..e2552b9f 100644 --- a/scripts/earthly/cargo-android/config.toml +++ b/scripts/earthly/cargo-android/config.toml @@ -1,8 +1,8 @@ [target.aarch64-linux-android] -linker = "/Android/Sdk/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android30-clang" +linker = "/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang" [target.armv7-linux-androideabi] -linker = "/Android/Sdk/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi30-clang" +linker = "/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi33-clang" [target.x86_64-linux-android] -linker = "/Android/Sdk/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" +linker = "/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android33-clang" [target.i686-linux-android] -linker = "/Android/Sdk/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android30-clang" \ No newline at end of file +linker = "/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android33-clang" \ No newline at end of file diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index 9a239431..ef064a52 100644 --- a/veilid-core/Cargo.toml +++ b/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) diff --git a/veilid-core/src/tests/android/.idea/.name b/veilid-core/src/tests/android/.idea/.name index 49552fb2..0a5c13c4 100644 --- a/veilid-core/src/tests/android/.idea/.name +++ b/veilid-core/src/tests/android/.idea/.name @@ -1 +1 @@ -VeilidCore Tests \ No newline at end of file +Veilid-Core Tests \ No newline at end of file diff --git a/veilid-core/src/tests/android/app/build.gradle b/veilid-core/src/tests/android/app/build.gradle index 9dadf0aa..f4069114 100644 --- a/veilid-core/src/tests/android/app/build.gradle +++ b/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" diff --git a/veilid-core/src/tests/android/app/src/main/AndroidManifest.xml b/veilid-core/src/tests/android/app/src/main/AndroidManifest.xml index 14b07cbe..c7052ecf 100644 --- a/veilid-core/src/tests/android/app/src/main/AndroidManifest.xml +++ b/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"> - + diff --git a/veilid-core/src/tests/android/build.gradle b/veilid-core/src/tests/android/build.gradle index 2e8d8f04..ffb3ba0e 100644 --- a/veilid-core/src/tests/android/build.gradle +++ b/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 { diff --git a/veilid-core/src/tests/android/settings.gradle b/veilid-core/src/tests/android/settings.gradle index bd623c72..24554dcf 100644 --- a/veilid-core/src/tests/android/settings.gradle +++ b/veilid-core/src/tests/android/settings.gradle @@ -1,2 +1,2 @@ include ':app' -rootProject.name = "VeilidCore Tests" \ No newline at end of file +rootProject.name = "Veilid-Core Tests" \ No newline at end of file diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 2adf291b..e426d861 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -59,8 +59,8 @@ send_wrapper = { version = "^0.6", features = ["futures"] } [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"] } lazy_static = "^1.4.0" tracing-android = { version = "^0", optional = true } android-logd-logger = "0.2.1"