liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

build updates

Browse Source
This commit is contained in:
John Smith 2022-11-30 16:15:54 -05:00
parent b2c14fc56c
commit edc87cd78e
11 changed files with 30 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Cargo.lock generated
View File

@ -737,9 +737,9 @@ checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
[[package]] [[package]]
name = "capnp" name = "capnp"
version = "0.15.1" version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4929d71efc55aa42759793d853ecdfa6bb034419d22884e3e9871f0f593ac8d" checksum = "afaa14ddcf4553e700608c1c0ee3ca1f4cf673470462b99ff6dd6bedcdb6c6ce"
[[package]] [[package]]
name = "capnp-futures" name = "capnp-futures"
@ -2630,11 +2630,8 @@ dependencies = [
name = "keyring-manager" name = "keyring-manager"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"android_logger",
"backtrace",
"byteorder", "byteorder",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"clap",
"core-foundation 0.9.3", "core-foundation 0.9.3",
"core-foundation-sys 0.8.3", "core-foundation-sys 0.8.3",
"directories", "directories",
@ -2643,18 +2640,14 @@ dependencies = [
"keychain-services", "keychain-services",
"lazy_static", "lazy_static",
"log", "log",
"ndk 0.6.0", "ndk",
"ndk-glue", "ndk-glue",
"rpassword 5.0.1",
"secret-service", "secret-service",
"security-framework", "security-framework",
"security-framework-sys", "security-framework-sys",
"serde", "serde",
"serde_cbor", "serde_cbor",
"serial_test",
"simplelog 0.12.0",
"snailquote", "snailquote",
"tempfile",
"winapi 0.3.9", "winapi 0.3.9",
] ]
@ -3019,19 +3012,6 @@ dependencies = [
"socket2", "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]] [[package]]
name = "ndk" name = "ndk"
version = "0.7.0" version = "0.7.0"
@ -3040,7 +3020,7 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"jni-sys", "jni-sys",
"ndk-sys 0.4.1+23.1.7779620", "ndk-sys",
"num_enum", "num_enum",
"raw-window-handle", "raw-window-handle",
"thiserror", "thiserror",
@ -3061,10 +3041,10 @@ dependencies = [
"android_logger", "android_logger",
"libc", "libc",
"log", "log",
"ndk 0.7.0", "ndk",
"ndk-context", "ndk-context",
"ndk-macro", "ndk-macro",
"ndk-sys 0.4.1+23.1.7779620", "ndk-sys",
"once_cell", "once_cell",
"parking_lot 0.12.1", "parking_lot 0.12.1",
] ]
@ -3082,15 +3062,6 @@ dependencies = [
"syn", "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]] [[package]]
name = "ndk-sys" name = "ndk-sys"
version = "0.4.1+23.1.7779620" version = "0.4.1+23.1.7779620"
@ -4239,16 +4210,6 @@ dependencies = [
"serde", "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]] [[package]]
name = "rpassword" name = "rpassword"
version = "6.0.1" version = "6.0.1"
@ -5204,9 +5165,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "1.8.0" version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -5787,7 +5748,7 @@ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"maplit", "maplit",
"ndk 0.6.0", "ndk",
"ndk-glue", "ndk-glue",
"nix 0.26.1", "nix 0.26.1",
"once_cell", "once_cell",
@ -5895,7 +5856,7 @@ dependencies = [
"opentelemetry-otlp", "opentelemetry-otlp",
"opentelemetry-semantic-conventions", "opentelemetry-semantic-conventions",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"rpassword 6.0.1", "rpassword",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_yaml", "serde_yaml",
@ -5935,7 +5896,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"maplit", "maplit",
"ndk 0.6.0", "ndk",
"ndk-glue", "ndk-glue",
"nix 0.26.1", "nix 0.26.1",
"once_cell", "once_cell",

2
Cargo.toml
View File

@ -9,7 +9,7 @@ members = [
"veilid-wasm", "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] [patch.crates-io]
cursive = { path = "./external/cursive/cursive" } cursive = { path = "./external/cursive/cursive" }

2
external/keyring-manager vendored

@ -1 +1 @@
Subproject commit 1655f89cf2ec70900c520080819d76ffad90adee Subproject commit b127b2d3c653fea163a776dd58b3798f28aeeee3

8
scripts/earthly/cargo-android/config.toml
View File

@ -1,8 +1,8 @@
[target.aarch64-linux-android] [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] [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] [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] [target.i686-linux-android]
linker = "/Android/Sdk/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android30-clang" linker = "/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android33-clang"

6
veilid-core/Cargo.toml
View File

@ -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-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" ] 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" ] veilid_core_ios_tests = [ "simplelog" ]
tracking = [] tracking = []
@ -128,8 +128,8 @@ features = [
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
jni = "^0" jni = "^0"
jni-sys = "^0" jni-sys = "^0"
ndk = { version = "^0", features = ["trace"] } ndk = { version = "^0.7" }
ndk-glue = { version = "^0", features = ["logger"] } ndk-glue = { version = "^0.7", features = ["logger"] }
tracing-android = { version = "^0" } tracing-android = { version = "^0" }
# Dependenices for all Unix (Linux, Android, MacOS, iOS) # Dependenices for all Unix (Linux, Android, MacOS, iOS)

2
veilid-core/src/tests/android/.idea/.name
View File

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

5
veilid-core/src/tests/android/app/build.gradle
View File

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

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

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

2
veilid-core/src/tests/android/build.gradle
View File

@ -13,7 +13,7 @@ buildscript {
} }
plugins { 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 { allprojects {

2
veilid-core/src/tests/android/settings.gradle
View File

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

4
veilid-tools/Cargo.toml
View File

@ -59,8 +59,8 @@ send_wrapper = { version = "^0.6", features = ["futures"] }
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
jni = "^0" jni = "^0"
jni-sys = "^0" jni-sys = "^0"
ndk = { version = "^0", features = ["trace"] } ndk = { version = "^0.7" }
ndk-glue = { version = "^0", features = ["logger"] } ndk-glue = { version = "^0.7", features = ["logger"] }
lazy_static = "^1.4.0" lazy_static = "^1.4.0"
tracing-android = { version = "^0", optional = true } tracing-android = { version = "^0", optional = true }
android-logd-logger = "0.2.1" android-logd-logger = "0.2.1"