commit f87ebdcbb4bcee4a81943230076a9282d16983d3
author markchien <markchien@google.com> Sat Dec 07 22:02:28 2019 +0800
committer Mark Chien <markchien@google.com> Tue Jan 07 07:42:13 2020 +0000
tree 9b23acd875cd53b48fc498f79e796fce7273a8aa
parent c6485f8368ca3d882953745f80ef3eb3c5cc0f45

Change tetheroffloadjni to tetheringutilsjni

Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.

Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests
      -Off/On hotspot with ipv6 upstream

Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 08552cb..596f62f 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -45,9 +45,9 @@
 
 // Due to b/143733063, APK can't access a jni lib that is in APEX (but not in the APK).
 cc_library {
-    name: "libtetheroffloadjni",
+    name: "libtetherutilsjni",
     srcs: [
-        "jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp",
+        "jni/android_net_util_TetheringUtils.cpp",
     ],
     shared_libs: [
         "libcgrouprc",
@@ -87,7 +87,7 @@
         "libcgrouprc",
         "libnativehelper_compat_libc++",
         "libvndksupport",
-        "libtetheroffloadjni",
+        "libtetherutilsjni",
     ],
     resource_dirs: [
         "res",