Merge "Move desktop variables to the right place" into main
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index a29093f..5a08fa1 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -163,10 +163,12 @@
"-DCONFIG_NO_RADIUS",
"-DCONFIG_NO_RADIUS",
"-DCONFIG_NO_RANDOM_POOL",
+ "-DCONFIG_NO_ROAMING",
"-DCONFIG_NO_VLAN",
"-DCONFIG_OFFCHANNEL",
"-DCONFIG_OWE",
"-DCONFIG_P2P",
+ "-DCONFIG_PASN",
"-DCONFIG_SAE",
"-DCONFIG_SAE_PK",
"-DCONFIG_SHA256",
@@ -233,21 +235,6 @@
any @ driver: ["-D" + driver],
// Flag is optional, so no default value provided.
default: [],
- }) +
- select(soong_config_variable("wpa_supplicant", "roaming"), {
- true: [],
- default: ["-DCONFIG_NO_ROAMING"],
- }) +
- select(soong_config_variable("wpa_supplicant", "pasn"), {
- false: [],
- default: ["-DCONFIG_PASN"],
- }) +
- select(soong_config_variable("wpa_supplicant", "bgscan_simple"), {
- true: [
- "-DCONFIG_BGSCAN",
- "-DCONFIG_BGSCAN_SIMPLE",
- ],
- default: [],
}),
// Similar to suppressing clang compiler warnings, here we
// suppress clang-tidy warnings to reduce noises in Android build.log.
@@ -305,6 +292,7 @@
"op_classes.c",
"p2p_supplicant.c",
"p2p_supplicant_sd.c",
+ "pasn_supplicant.c",
"robust_av.c",
"rrm.c",
"scan.c",
@@ -436,6 +424,9 @@
"src/p2p/p2p_pd.c",
"src/p2p/p2p_sd.c",
"src/p2p/p2p_utils.c",
+ "src/pasn/pasn_initiator.c",
+ "src/pasn/pasn_responder.c",
+ "src/pasn/pasn_common.c",
"src/rsn_supp/pmksa_cache.c",
"src/rsn_supp/preauth.c",
"src/rsn_supp/tdls.c",
@@ -483,24 +474,7 @@
"wpas_glue.c",
"wpa_supplicant.c",
"wps_supplicant.c",
- ] +
- select(soong_config_variable("wpa_supplicant", "bgscan_simple"), {
- true: [
- "bgscan.c",
- "bgscan_simple.c",
- ],
- default: [],
- }) +
- select(soong_config_variable("wpa_supplicant", "pasn"), {
- false: [],
- default: [
- "pasn_supplicant.c",
- "src/pasn/pasn_initiator.c",
- "src/pasn/pasn_responder.c",
- "src/pasn/pasn_common.c",
- ],
- }),
-
+ ],
}
// Generated by building wpa_cli and printing LOCAL_SRC_FILES
@@ -840,12 +814,10 @@
"-DCONFIG_NO_RADIUS",
"-DCONFIG_NO_RADIUS",
"-DCONFIG_NO_RANDOM_POOL",
- "-DCONFIG_NO_ROAMING",
"-DCONFIG_NO_VLAN",
"-DCONFIG_OFFCHANNEL",
"-DCONFIG_OWE",
"-DCONFIG_P2P",
- "-DCONFIG_PASN",
"-DCONFIG_PTKSA_CACHE",
"-DCONFIG_SAE",
"-DCONFIG_SAE_PK",
@@ -919,6 +891,18 @@
}) + select(soong_config_variable("wpa_supplicant_8", "wpa_supplicant_11be"), {
true: ["-DCONFIG_IEEE80211BE"],
default: [],
+ }) + select(soong_config_variable("wpa_supplicant", "roaming"), {
+ true: [],
+ default: ["-DCONFIG_NO_ROAMING"],
+ }) + select(soong_config_variable("wpa_supplicant", "pasn"), {
+ false: [],
+ default: ["-DCONFIG_PASN"],
+ }) + select(soong_config_variable("wpa_supplicant", "bgscan_simple"), {
+ true: [
+ "-DCONFIG_BGSCAN",
+ "-DCONFIG_BGSCAN_SIMPLE",
+ ],
+ default: [],
}),
arch: {
arm: {
@@ -1013,7 +997,6 @@
"op_classes.c",
"p2p_supplicant.c",
"p2p_supplicant_sd.c",
- "pasn_supplicant.c",
"robust_av.c",
"rrm.c",
"scan.c",
@@ -1148,9 +1131,6 @@
"src/p2p/p2p_pd.c",
"src/p2p/p2p_sd.c",
"src/p2p/p2p_utils.c",
- "src/pasn/pasn_common.c",
- "src/pasn/pasn_initiator.c",
- "src/pasn/pasn_responder.c",
"src/rsn_supp/pmksa_cache.c",
"src/rsn_supp/preauth.c",
"src/rsn_supp/tdls.c",
@@ -1197,6 +1177,20 @@
}) + select(soong_config_variable("wpa_supplicant_8", "wpa_supplicant_11be"), {
true: ["src/ap/ieee802_11_eht.c"],
default: [],
+ }) + select(soong_config_variable("wpa_supplicant", "bgscan_simple"), {
+ true: [
+ "bgscan.c",
+ "bgscan_simple.c",
+ ],
+ default: [],
+ }) + select(soong_config_variable("wpa_supplicant", "pasn"), {
+ false: [],
+ default: [
+ "pasn_supplicant.c",
+ "src/pasn/pasn_initiator.c",
+ "src/pasn/pasn_responder.c",
+ "src/pasn/pasn_common.c",
+ ],
}),
defaults: [
"wpa_supplicant_driver_srcs_default",