Pare down cflags and srcs for mainline supplicant
mainline supplicant doesn't need these.
Bug: 365585450
Test: m
Test: flash to Tokay, ran scans and connections, second supplicant is
still alive
Change-Id: I2d7b02e2d8fbf84431da41163c39af1109fd835c
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index f66d45b..5361289 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -919,85 +919,28 @@
cflags: [
"-DANDROID_LIB_STUB",
"-DANDROID_LOG_NAME=\"mainline_supplicant\"",
- "-DCONFIG_ACS",
"-DCONFIG_ANDROID_LOG",
- "-DCONFIG_AP",
"-DCONFIG_BACKEND_FILE",
"-DCONFIG_CTRL_IFACE",
"-DCONFIG_CTRL_IFACE_UNIX",
- "-DCONFIG_DPP",
- "-DCONFIG_DPP2",
"-DCONFIG_DRIVER_NL80211",
- "-DCONFIG_DRIVER_NL80211_QCA",
- "-DCONFIG_ECC",
- "-DCONFIG_ERP",
- "-DCONFIG_FILS",
- "-DCONFIG_GAS",
- "-DCONFIG_GAS_SERVER",
- "-DCONFIG_HMAC_SHA256_KDF",
- "-DCONFIG_HMAC_SHA384_KDF",
- "-DCONFIG_HMAC_SHA512_KDF",
- "-DCONFIG_HS20",
- "-DCONFIG_IEEE80211AC",
- "-DCONFIG_IEEE80211R",
- "-DCONFIG_INTERWORKING",
- "-DCONFIG_IPV6",
- "-DCONFIG_JSON",
- "-DCONFIG_MBO",
"-DCONFIG_NO_ACCOUNTING",
- "-DCONFIG_NO_RADIUS",
+ "-DCONFIG_NO_CONFIG_BLOBS",
+ "-DCONFIG_NO_CONFIG_WRITE",
"-DCONFIG_NO_RADIUS",
"-DCONFIG_NO_RANDOM_POOL",
"-DCONFIG_NO_ROAMING",
+ "-DCONFIG_NO_ROBUST_AV",
+ "-DCONFIG_NO_RRM",
+ "-DCONFIG_NO_SCAN_PROCESSING",
+ "-DCONFIG_NO_TKIP",
"-DCONFIG_NO_VLAN",
+ "-DCONFIG_NO_WMM_AC",
+ "-DCONFIG_NO_WPA",
+ "-DCONFIG_NO_WPA_PASSPHRASE",
"-DCONFIG_OFFCHANNEL",
- "-DCONFIG_OWE",
- "-DCONFIG_P2P",
- "-DCONFIG_PASN",
- "-DCONFIG_PTKSA_CACHE",
- "-DCONFIG_SAE",
- "-DCONFIG_SAE_PK",
- "-DCONFIG_SHA256",
- "-DCONFIG_SHA384",
- "-DCONFIG_SHA512",
- "-DCONFIG_SMARTCARD",
- "-DCONFIG_SME",
- "-DCONFIG_SUITEB",
- "-DCONFIG_SUITEB192",
- "-DCONFIG_TDLS",
- "-DCONFIG_WEP",
- "-DCONFIG_WIFI_DISPLAY",
- "-DCONFIG_WNM",
- "-DCONFIG_WPS",
- "-DCONFIG_WPS_ER",
- "-DCONFIG_WPS_NFC",
- "-DCONFIG_WPS_OOB",
- "-DCONFIG_WPS_UPNP",
- "-DCRYPTO_RSA_OAEP_SHA256",
- "-DEAP_AKA",
- "-DEAP_AKA_PRIME",
- "-DEAP_GTC",
- "-DEAP_LEAP",
- "-DEAP_MD5",
- "-DEAP_MSCHAPv2",
- "-DEAP_OTP",
- "-DEAP_PEAP",
- "-DEAP_PWD",
- "-DEAP_SERVER",
- "-DEAP_SERVER_IDENTITY",
- "-DEAP_SERVER_WSC",
- "-DEAP_SIM",
- "-DEAP_TLS",
- "-DEAP_TLSV1_3",
- "-DEAP_TLS_OPENSSL",
- "-DEAP_TTLS",
- "-DEAP_WSC",
- "-DIEEE8021X_EAPOL",
"-DMAINLINE_SUPPLICANT",
- "-DNEED_AP_MLME",
"-DOPENSSL_NO_ENGINE",
- "-DPKCS12_FUNCS",
- "-DTLS_DEFAULT_CIPHERS=\"DEFAULT:!EXP:!LOW\"",
"-DWPA_IGNORE_CONFIG_ERRORS",
"-Wall",
"-Werror",
@@ -1010,22 +953,7 @@
"-Wno-unused-function",
"-Wno-unused-parameter",
"-Wno-unused-variable",
- ] + select(soong_config_variable("wpa_supplicant_8", "wpa_supplicant_use_stub_lib"), {
- true: ["-DANDROID_LIB_STUB"],
- default: [],
- }) + select(soong_config_variable("wpa_supplicant_8", "board_hostapd_config_80211w_mfp_optional"), {
- true: ["-DENABLE_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL"],
- default: [],
- }) + select(soong_config_variable("wpa_supplicant_8", "wifi_priv_cmd_update_mbo_cell_status"), {
- true: ["-DENABLE_PRIV_CMD_UPDATE_MBO_CELL_STATUS"],
- default: [],
- }) + select(soong_config_variable("wpa_supplicant_8", "hostapd_11ax"), {
- true: ["-DCONFIG_IEEE80211AX"],
- default: [],
- }) + select(soong_config_variable("wpa_supplicant_8", "wifi_brcm_open_source_multi_akm"), {
- true: ["-DWIFI_BRCM_OPEN_SOURCE_MULTI_AKM"],
- default: [],
- }),
+ ],
}
cc_defaults {
@@ -1238,6 +1166,62 @@
],
}
+cc_defaults {
+ name: "wpa_supplicant_mainline_srcs_default",
+ srcs: [
+ "bss.c",
+ "bssid_ignore.c",
+ "config.c",
+ "config_file.c",
+ "ctrl_iface.c",
+ "ctrl_iface_unix.c",
+ "eap_register.c",
+ "events.c",
+ "main.c",
+ "notify.c",
+ "offchannel.c",
+ "op_classes.c",
+ "rrm.c",
+ "scan.c",
+ "wpa_supplicant.c",
+ "wpas_glue.c",
+ "src/common/ctrl_iface_common.c",
+ "src/common/hw_features_common.c",
+ "src/common/ieee802_11_common.c",
+ "src/common/ptksa_cache.c",
+ "src/common/wpa_common.c",
+ "src/crypto/crypto_openssl.c",
+ "src/crypto/tls_none.c",
+ "src/drivers/driver_common.c",
+ "src/drivers/driver_nl80211.c",
+ "src/drivers/driver_nl80211_android.c",
+ "src/drivers/driver_nl80211_capa.c",
+ "src/drivers/driver_nl80211_event.c",
+ "src/drivers/driver_nl80211_monitor.c",
+ "src/drivers/driver_nl80211_scan.c",
+ "src/drivers/drivers.c",
+ "src/drivers/linux_ioctl.c",
+ "src/drivers/netlink.c",
+ "src/drivers/rfkill.c",
+ "src/l2_packet/l2_packet_linux.c",
+ "src/rsn_supp/pmksa_cache.c",
+ "src/utils/base64.c",
+ "src/utils/bitfield.c",
+ "src/utils/common.c",
+ "src/utils/config.c",
+ "src/utils/crc32.c",
+ "src/utils/eloop.c",
+ "src/utils/ip_addr.c",
+ "src/utils/os_unix.c",
+ "src/utils/radiotap.c",
+ "src/utils/wpa_debug.c",
+ "src/utils/wpabuf.c",
+ ],
+ defaults: [
+ "wpa_supplicant_driver_srcs_default",
+ ],
+}
+
cc_binary {
name: "wpa_cli",
proprietary: true,
@@ -1390,7 +1374,7 @@
"mainline_supplicant_aidl_bp",
],
defaults: [
- "wpa_supplicant_srcs_default",
+ "wpa_supplicant_mainline_srcs_default",
"wpa_supplicant_includes_default",
"wpa_supplicant_mainline_cflags_default",
],
@@ -1430,7 +1414,7 @@
"service_fuzzer_defaults",
"wpa_supplicant_includes_default",
"wpa_supplicant_mainline_cflags_default",
- "wpa_supplicant_srcs_default",
+ "wpa_supplicant_mainline_srcs_default",
],
shared_libs: [
"android.system.wifi.mainline_supplicant-ndk",