diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 8ad3a28..9d4b997 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -35,6 +35,10 @@
 L_CFLAGS += -DANDROID_BRCM_P2P_PATCH
 endif
 
+ifdef CONFIG_ROAMING
+L_CFLAGS += -DCONFIG_ROAMING
+endif
+
 # Use Android specific directory for control interface sockets
 L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\"
 L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/wpa_supplicant\"
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 812cd52..26e355e 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -837,6 +837,7 @@
 	if (!current_bss)
 		return 1; /* current BSS not seen in scan results */
 
+#ifdef CONFIG_ROAMING
 	wpa_dbg(wpa_s, MSG_DEBUG, "Considering within-ESS reassociation");
 	wpa_dbg(wpa_s, MSG_DEBUG, "Current BSS: " MACSTR " level=%d",
 		MAC2STR(current_bss->bssid), current_bss->level);
@@ -871,6 +872,9 @@
 	}
 
 	return 1;
+#else
+	return 0;
+#endif
 }
 
 /* Return < 0 if no scan results could be fetched. */