commit 06fd525b578ed2f363b06852c12762bbdde750c0
author Gabriel Biren <gbiren@google.com> Thu Dec 26 22:10:24 2024 +0000
committer Gabriel Biren <gbiren@google.com> Fri Jan 03 19:30:37 2025 +0000
tree 94b00ce7c7774e5345993498fc3854da5652320c
parent d68a0fa0de5a88535026e8559af400b3b809e62c

Add the USD dependencies to wpa_supplicant_defaults
and remove the workaround in sta_iface.cpp

This cc_defaults is used by some targets like
Cuttlefish.

Bug: 384527237
Test: Treehugger builds
Change-Id: I4228af5595758187ef1943e1ec76153f7976a3b5

wpa_supplicant/Android.bp

diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index f2fb64f..fb74517 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -150,6 +150,7 @@
         "-DCONFIG_IPV6",
         "-DCONFIG_JSON",
         "-DCONFIG_MBO",
+        "-DCONFIG_NAN_USD",
         "-DCONFIG_NO_ACCOUNTING",
         "-DCONFIG_NO_RADIUS",
         "-DCONFIG_NO_RADIUS",
@@ -290,6 +291,7 @@
         "interworking.c",
         "main.c",
         "mbo.c",
+        "nan_usd.c",
         "notify.c",
         "offchannel.c",
         "op_classes.c",
@@ -326,6 +328,7 @@
         "src/ap/ieee802_11_vht.c",
         "src/ap/ieee802_1x.c",
         "src/ap/mbo_ap.c",
+        "src/ap/nan_usd_ap.c",
         "src/ap/neighbor_db.c",
         "src/ap/p2p_hostapd.c",
         "src/ap/pmksa_cache_auth.c",
@@ -351,6 +354,7 @@
         "src/common/gas_server.c",
         "src/common/hw_features_common.c",
         "src/common/ieee802_11_common.c",
+        "src/common/nan_de.c",
         "src/common/sae.c",
         "src/common/sae_pk.c",
         "src/common/wpa_common.c",