Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni"
* changes:
Separate bpf and struct util from netlink util library
Use JniUtil.getJniLibraryName to find library name
Add JniUtil to identify jni library by package name
diff --git a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
index 77b7835..30a1c33 100644
--- a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
+++ b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
@@ -35,6 +35,12 @@
private DeviceConfigUtils() {}
private static final String TAG = DeviceConfigUtils.class.getSimpleName();
+ /**
+ * DO NOT MODIFY: this may be used by multiple modules that will not see the updated value
+ * until they are recompiled, so modifying this constant means that different modules may
+ * be referencing a different tethering module variant, or having a stale reference.
+ */
+ public static final String TETHERING_MODULE_NAME = "com.android.tethering";
@VisibleForTesting
public static void resetPackageVersionCacheForTest() {