Support wpa_cli/hostapd_cli/hs20-osu-client in the
bp build files.
Bug: 311342389
Test: m
Change-Id: Id742dcf51311362cab9105c12f82f61db227a25a
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index ca56d14..7fd11b5 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -332,10 +332,12 @@
"src/common/sae_pk.c",
"src/common/wpa_common.c",
"src/crypto/aes-ctr.c",
+ "src/crypto/aes-encblock.c",
"src/crypto/aes-siv.c",
"src/crypto/crypto_openssl.c",
"src/crypto/dh_groups.c",
"src/crypto/fips_prf_openssl.c",
+ "src/crypto/milenage.c",
"src/crypto/ms_funcs.c",
"src/crypto/sha1-prf.c",
"src/crypto/sha1-tlsprf.c",
@@ -438,6 +440,7 @@
"src/wps/wps_upnp_event.c",
"src/wps/wps_upnp_ssdp.c",
"src/wps/wps_upnp_web.c",
+ "twt.c",
"wifi_display.c",
"wmm_ac.c",
"wnm_sta.c",
@@ -446,3 +449,35 @@
"wps_supplicant.c",
],
}
+
+// Generated by building wpa_cli and printing LOCAL_SRC_FILES
+filegroup {
+ name: "wpa_cli_srcs",
+ srcs: [
+ "src/common/cli.c",
+ "src/utils/common.c",
+ "src/utils/edit.c",
+ "src/utils/eloop.c",
+ "src/utils/os_unix.c",
+ "src/utils/wpa_debug.c",
+ "wpa_cli.c",
+ ],
+}
+
+// Generated by building libwpa_client and printing LOCAL_SRC_FILES
+filegroup {
+ name: "libwpa_client_srcs",
+ srcs: [
+ "src/common/wpa_ctrl.c",
+ "src/utils/os_unix.c",
+ ],
+}
+
+cc_library_headers {
+ name: "libwpa_client_headers",
+ export_include_dirs: [
+ ".",
+ "wpa_client_include/libwpa_client",
+ ],
+ soc_specific: true,
+}
diff --git a/wpa_supplicant/aidl/Android.bp b/wpa_supplicant/aidl/Android.bp
index 481ad0b..2175462 100644
--- a/wpa_supplicant/aidl/Android.bp
+++ b/wpa_supplicant/aidl/Android.bp
@@ -30,7 +30,10 @@
cc_library_static {
name: "libwpa_aidl_bp",
srcs: ["*.cpp"],
- defaults: ["wpa_supplicant_cflags_defaults"],
+ defaults: [
+ "libwpa_aidl_cflags_defaults",
+ "wpa_supplicant_cflags_defaults",
+ ],
soc_specific: true,
shared_libs: [
"android.hardware.wifi.supplicant-V3-ndk",
@@ -60,3 +63,22 @@
name: "android.hardware.wifi.supplicant.xml",
srcs: ["android.hardware.wifi.supplicant.xml"],
}
+
+soong_config_module_type {
+ name: "libwpa_aidl_cflags_cc_defaults",
+ module_type: "cc_defaults",
+ config_namespace: "libwpa_aidl",
+ value_variables: [
+ "nl80211_driver",
+ ],
+ properties: ["cflags"],
+}
+
+libwpa_aidl_cflags_cc_defaults {
+ name: "libwpa_aidl_cflags_defaults",
+ soong_config_variables: {
+ nl80211_driver: {
+ cflags: ["-D%s"],
+ },
+ },
+}