diff --git a/Tethering/src/android/net/util/TetheringUtils.java b/Tethering/src/android/net/util/TetheringUtils.java index 706d78c1cc..9e7cc2fc14 100644 --- a/Tethering/src/android/net/util/TetheringUtils.java +++ b/Tethering/src/android/net/util/TetheringUtils.java @@ -36,6 +36,10 @@ import java.util.Objects; * {@hide} */ public class TetheringUtils { + static { + System.loadLibrary("tetherutilsjni"); + } + public static final byte[] ALL_NODES = new byte[] { (byte) 0xff, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; diff --git a/Tethering/src/com/android/networkstack/tethering/BpfMap.java b/Tethering/src/com/android/networkstack/tethering/BpfMap.java index bc01dbd41d..9a9376f0a7 100644 --- a/Tethering/src/com/android/networkstack/tethering/BpfMap.java +++ b/Tethering/src/com/android/networkstack/tethering/BpfMap.java @@ -41,6 +41,10 @@ import java.util.function.BiConsumer; * @param the value of the map. */ public class BpfMap implements AutoCloseable { + static { + System.loadLibrary("tetherutilsjni"); + } + // Following definitions from kernel include/uapi/linux/bpf.h public static final int BPF_F_RDWR = 0; public static final int BPF_F_RDONLY = 1 << 3; diff --git a/Tethering/src/com/android/networkstack/tethering/TetheringService.java b/Tethering/src/com/android/networkstack/tethering/TetheringService.java index 613328d1c1..c69dc49c25 100644 --- a/Tethering/src/com/android/networkstack/tethering/TetheringService.java +++ b/Tethering/src/com/android/networkstack/tethering/TetheringService.java @@ -82,7 +82,6 @@ public class TetheringService extends Service { */ @VisibleForTesting public Tethering makeTethering(TetheringDependencies deps) { - System.loadLibrary("tetherutilsjni"); return new Tethering(deps); }