From 782a56809b202fcda46618410e769b407f598a51 Mon Sep 17 00:00:00 2001
From: markchien <markchien@google.com>
Date: Wed, 10 Nov 2021 01:11:33 +0800
Subject: [PATCH] Rename libbpfmapjni and include bpf common util library

1. libbpfmapjni.so is rename to libnet_utils_device_common_bpf.so
2. net-utils-device-common-bpf.jar is separated from
   net-utils-device-common-netlink.jar

Bug: 205088391
Test: atest TetheringTests
      atest CtsTetheringTest
      atest TetheringPrivilegedTests

Change-Id: If59b35b3429ebd597c18678499ff458183f89026
---
 Tethering/Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index b1d9b973a5..3c49383e80 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -43,6 +43,7 @@ java_defaults {
         "android.hardware.tetheroffload.control-V1.1-java",
         "net-utils-framework-common",
         "net-utils-device-common",
+        "net-utils-device-common-bpf",
         "net-utils-device-common-netlink",
         "netd-client",
     ],
@@ -103,7 +104,7 @@ cc_library {
         "libnativehelper_compat_libc++",
     ],
     static_libs: [
-        "libbpfmapjni",
+        "libnet_utils_device_common_bpfjni",
         "libnetjniutils",
     ],