Android: Move WPA_BUILD check in Android.mk

This is part of commit e61a2d6db6113da5fad91660764afdb0596dbc46 from
Android wpa_supplicant_8.git.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

hostapd/Android.mk

@@ -6,6 +6,8 @@ ifneq ($(BOARD_HOSTAPD_DRIVER),)
   CONFIG_DRIVER_$(BOARD_HOSTAPD_DRIVER) := y
 endif
 
+ifeq ($(WPA_BUILD_HOSTAPD),true)
+
 include $(LOCAL_PATH)/.config
 
 # To ignore possible wrong network configurations
@@ -791,8 +793,6 @@ else
 OBJS_c += src/utils/edit_simple.c
 endif
 
-ifeq ($(WPA_BUILD_HOSTAPD),true)
-
 ########################
 
 include $(CLEAR_VARS)

wpa_supplicant/Android.mk

@@ -24,6 +24,8 @@ ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
   CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y
 endif
 
+ifeq ($(WPA_BUILD_SUPPLICANT),true)
+
 include $(LOCAL_PATH)/.config
 
 # To ignore possible wrong network configurations
@@ -1398,8 +1400,6 @@ ifndef LDO
 LDO=$(CC)
 endif
 
-ifeq ($(WPA_BUILD_SUPPLICANT),true)
-
 ########################
 
 include $(CLEAR_VARS)