Merge "libpasn: Add Android.bp changes to generate pasn library" into main
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index c535147..00e48c4 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -129,7 +129,6 @@
"-DCONFIG_NO_RADIUS",
"-DCONFIG_NO_RADIUS",
"-DCONFIG_NO_RANDOM_POOL",
- "-DCONFIG_NO_ROAMING",
"-DCONFIG_NO_VLAN",
"-DCONFIG_OFFCHANNEL",
"-DCONFIG_OWE",
@@ -201,6 +200,10 @@
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"],
}),
// Similar to suppressing clang compiler warnings, here we
// suppress clang-tidy warnings to reduce noises in Android build.log.
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 24c1f0f..581d907 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -18,7 +18,11 @@
CONFIG_DRIVER_NL80211_QCA=y
endif
-include $(LOCAL_PATH)/android.config
+ifneq ($(SUPPLICANT_CUSTOM_DEF_CONFIG_FILE_PATH),)
+ include $(SUPPLICANT_CUSTOM_DEF_CONFIG_FILE_PATH)
+else
+ include $(LOCAL_PATH)/android.config
+endif
# To ignore possible wrong network configurations
L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS