From 20b2161d5b716c48d11e7842b7b552acc150d6bb Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 23 Nov 2011 17:58:44 +0200 Subject: [PATCH] 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 --- hostapd/Android.mk | 4 ++-- wpa_supplicant/Android.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 46f2cd6e1..7f0ba5cf0 100644 --- a/hostapd/Android.mk +++ b/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) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 9bf76a2b7..a6562390d 100644 --- a/wpa_supplicant/Android.mk +++ b/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)