summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Wasilczyk <twasilczyk@google.com>2023-10-09 18:25:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-09 18:25:32 +0000
commit66da9787cf1909a1292e4d6bf5c93bf209e5edb8 (patch)
treef4f9cf8d6cff8ed103e272da6f99c752e69b6882
parent7bdf9b302c77ffa1a580e448cb469a57de260b7e (diff)
parent9fc38745ca5cd6f51369dcb560db3d3e4d81c69e (diff)
downloadwificond-66da9787cf1909a1292e4d6bf5c93bf209e5edb8.tar.gz
Merge "Clean up nlinterceptor dependencies" into main am: af0c909085 am: 70b3772076 am: 9fc38745ca
Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2775224 Change-Id: I216edcb12e78aad2f8f32e6f80a446018e00794b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp7
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index a369180..8012797 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,7 +78,6 @@ cc_defaults {
"android.system.wifi.keystore@1.0",
],
static_libs: [
- "libnlinterceptor",
"libwificond", // Wificond daemon
"libwifikeystorehal", // Wifi Keystore HAL service
],
@@ -155,13 +154,10 @@ cc_library_static {
],
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 @@ cc_test {
static_libs: [
"libgmock",
"libgtest",
- "libnlinterceptor",
"libwifi-system-iface-test",
"libwificond",
"libwificond_nl",