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

fix netlink and java local references, add android 32-bit support for arm

Browse Source
This commit is contained in:
John Smith 2022-01-06 11:14:27 -05:00
parent e412e47474
commit 8d4ef01086
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/keyring-rs vendored

@ -1 +1 @@
Subproject commit b4a075070682f250d00feb00dd078f35f5127ed6 Subproject commit 8b34ace77dfca20c482fc856a4b027bdd297f445

2
veilid-core/src/intf/native/utils/network_interfaces/netlink.rs
View File

@ -21,7 +21,7 @@ use tools::*;
fn get_interface_name(index: u32) -> Result<String, String> { fn get_interface_name(index: u32) -> Result<String, String> {
let mut ifnamebuf = [0u8; (IF_NAMESIZE + 1)]; let mut ifnamebuf = [0u8; (IF_NAMESIZE + 1)];
cfg_if! { cfg_if! {
if #[cfg(all(target_os = "android", target_arch = "aarch64"))] { if #[cfg(all(target_os = "android", any(target_arch = "arm", target_arch = "aarch64")))] {
if unsafe { if_indextoname(index, ifnamebuf.as_mut_ptr()) }.is_null() { if unsafe { if_indextoname(index, ifnamebuf.as_mut_ptr()) }.is_null() {
return Err("if_indextoname returned null".to_owned()); return Err("if_indextoname returned null".to_owned());
} }

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

@ -16,7 +16,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk { ndk {
abiFilters 'arm64-v8a', 'x86', 'x86_64' abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
} }
// Required to copy libc++_shared.so // Required to copy libc++_shared.so
@ -63,7 +63,7 @@ apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
cargo { cargo {
module = "../../../../../veilid-core" module = "../../../../../veilid-core"
libname = "veilid_core" libname = "veilid_core"
targets = ["arm64", "x86", "x86_64"] targets = ["arm", "arm64", "x86", "x86_64"]
targetDirectory = "../../../../../target" targetDirectory = "../../../../../target"
prebuiltToolchains = true prebuiltToolchains = true
profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release" profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release"