commit 70b3772076b17dcbd290b0b84b53398987249fb8
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Oct 09 16:29:08 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 09 16:29:08 2023 +0000
tree f4f9cf8d6cff8ed103e272da6f99c752e69b6882
parent da352227663cff5425bbd36bfdcc0c64070cb754
parent af0c909085e75fec4bde91426aadc6c93d39b550

Merge "Clean up nlinterceptor dependencies" into main am: af0c909085

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2775224

Change-Id: I2dda22c6485ebec647a1e1eee0794553836e6d5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index a369180..8012797 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,7 +78,6 @@
         "android.system.wifi.keystore@1.0",
     ],
     static_libs: [
-        "libnlinterceptor",
         "libwificond", // Wificond daemon
         "libwifikeystorehal", // Wifi Keystore HAL service
     ],
@@ -155,13 +154,10 @@
     ],
     shared_libs: [
         "android.hardware.net.nlinterceptor-V1-ndk",
-        "libbinder_ndk",
         "libbase",
     ],
-    whole_static_libs: [
+    static_libs: [
         "libnlinterceptor",
-        "android.hardware.automotive.can@libnetdevice",
-        "libnl++",
     ],
 }
 
@@ -283,7 +279,6 @@
     static_libs: [
         "libgmock",
         "libgtest",
-        "libnlinterceptor",
         "libwifi-system-iface-test",
         "libwificond",
         "libwificond_nl",