Merge "Clean up nlinterceptor dependencies" into main am: af0c909085 am: 70b3772076
Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2775224
Change-Id: I673368a930fc2d8003fc463f39565a6af1e88322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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",