From 8d4ef010864e56aed163194cd9ebeeecd189725e Mon Sep 17 00:00:00 2001
From: John Smith <jsmith@example.com>
Date: Thu, 6 Jan 2022 11:14:27 -0500
Subject: [PATCH] fix netlink and java local references, add android 32-bit
 support for arm

---
 external/keyring-rs                                           | 2 +-
 .../src/intf/native/utils/network_interfaces/netlink.rs       | 2 +-
 veilid-core/src/tests/android/app/build.gradle                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/external/keyring-rs b/external/keyring-rs
index b4a07507..8b34ace7 160000
--- a/external/keyring-rs
+++ b/external/keyring-rs
@@ -1 +1 @@
-Subproject commit b4a075070682f250d00feb00dd078f35f5127ed6
+Subproject commit 8b34ace77dfca20c482fc856a4b027bdd297f445
diff --git a/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs b/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs
index a99a239c..a98b8644 100644
--- a/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs
+++ b/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs
@@ -21,7 +21,7 @@ use tools::*;
 fn get_interface_name(index: u32) -> Result<String, String> {
     let mut ifnamebuf = [0u8; (IF_NAMESIZE + 1)];
     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() {
                 return Err("if_indextoname returned null".to_owned());
             }
diff --git a/veilid-core/src/tests/android/app/build.gradle b/veilid-core/src/tests/android/app/build.gradle
index 36f620e9..28db6718 100644
--- a/veilid-core/src/tests/android/app/build.gradle
+++ b/veilid-core/src/tests/android/app/build.gradle
@@ -16,7 +16,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
-            abiFilters 'arm64-v8a', 'x86', 'x86_64'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
 
         // Required to copy libc++_shared.so
@@ -63,7 +63,7 @@ apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 cargo {
     module  = "../../../../../veilid-core"
     libname = "veilid_core"
-    targets = ["arm64", "x86", "x86_64"]
+    targets = ["arm", "arm64", "x86", "x86_64"]
     targetDirectory = "../../../../../target"
     prebuiltToolchains = true
     profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release"