commit a804c2ed8532cff44eab0ab652157e8d18fe18ca
author Junyu Lai <junyulai@google.com> Tue Aug 29 10:07:11 2023 +0800
committer Junyu Lai <junyulai@google.com> Mon Oct 23 19:56:22 2023 +0800
tree 02a97ec01602c4e2515ddc047f4d137d8daca8c7
parent b23ebd5696209ff8b67d222c91dc9e0c5111f3b4

[BR01.4] Explicitedly statically link to struct library

Struct library was statically linked in netlink library.
It is now dynamically linked for netlink library, so add it as
static library when building tethering apk.

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.BpfNetMapsTest
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.net.module.util.StructTest
Bug: 297836825
Change-Id: Ia08d573054844df8ac18fec33c37ef51eaa14c9d

Android.bp

diff --git a/Android.bp b/Android.bp
index 1c0f547..61b4a1e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -337,7 +337,10 @@
         "src/**/*.java",
         ":statslog-networkstack-java-gen-current"
     ],
-    static_libs: ["NetworkStackApiCurrentShims"],
+    static_libs: [
+        "NetworkStackApiCurrentShims",
+        "net-utils-device-common-struct",
+    ],
     manifest: "AndroidManifestBase.xml",
     visibility: [
         "//frameworks/base/tests/net/integration",
@@ -355,7 +358,10 @@
         "src/**/*.java",
         ":statslog-networkstack-java-gen-stable",
     ],
-    static_libs: ["NetworkStackApiStableShims"],
+    static_libs: [
+        "NetworkStackApiStableShims",
+        "net-utils-device-common-struct",
+    ],
     manifest: "AndroidManifestBase.xml",
     visibility: [
         "//frameworks/base/packages/Connectivity/tests/integration",