diff --git a/hostapd/.config b/hostapd/.config
index 3569770..e57aafe 100644
--- a/hostapd/.config
+++ b/hostapd/.config
@@ -10,7 +10,7 @@
 # to override previous values of the variables.
 
 # Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
+#CONFIG_DRIVER_HOSTAP=y
 
 # Driver interface for wired authenticator
 #CONFIG_DRIVER_WIRED=y
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index ebc4aa9..a2772c2 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -8,6 +8,8 @@
   endif
 endif
 
+ifeq ($(WPA_BUILD_HOSTAPD),true)
+
 include $(LOCAL_PATH)/.config
 
 # To ignore possible wrong network configurations
@@ -781,8 +783,6 @@
 OBJS_c += src/utils/wpa_debug.c
 endif
 
-ifeq ($(WPA_BUILD_HOSTAPD),true)
-
 ########################
 
 include $(CLEAR_VARS)
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 69f02b6..fffb1f8 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -25,6 +25,8 @@
   endif
 endif
 
+ifeq ($(WPA_BUILD_SUPPLICANT),true)
+
 include $(LOCAL_PATH)/.config
 
 # To ignore possible wrong network configurations
@@ -1363,8 +1365,6 @@
 LDO=$(CC)
 endif
 
-ifeq ($(WPA_BUILD_SUPPLICANT),true)
-
 ########################
 
 include $(CLEAR_VARS)