aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/Android.mk
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-11-08 02:01:25 (GMT)
committerJouni Malinen <j@w1.fi>2013-11-08 09:47:00 (GMT)
commit5e42035ed920ccb5e5d3f870ef711da48a174582 (patch)
treedf5defa74f3f3ce439da4e0482596777e220d977 /wpa_supplicant/Android.mk
parent643fab30a0247cce72fce982af64d2da275ce494 (diff)
downloadhostap-5e42035ed920ccb5e5d3f870ef711da48a174582.zip
hostap-5e42035ed920ccb5e5d3f870ef711da48a174582.tar.gz
hostap-5e42035ed920ccb5e5d3f870ef711da48a174582.tar.bz2
Android: Fix CONFIG_EAP_PROXY option and move it to right place
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/Android.mk')
-rw-r--r--wpa_supplicant/Android.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index eda3106..9df2543 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -504,6 +504,13 @@ CONFIG_EAP_SIM_COMMON=y
NEED_AES_CBC=y
endif
+ifdef CONFIG_EAP_PROXY
+L_CFLAGS += -DCONFIG_EAP_PROXY
+OBJS += src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).c
+include eap_proxy_$(CONFIG_EAP_PROXY).mk
+CONFIG_IEEE8021X_EAPOL=y
+endif
+
ifdef CONFIG_EAP_AKA_PRIME
# EAP-AKA'
ifeq ($(CONFIG_EAP_AKA_PRIME), dyn)
@@ -1550,12 +1557,6 @@ ifneq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)
LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB)
endif
LOCAL_SHARED_LIBRARIES := libc libcutils liblog
-
-ifdef CONFIG_EAP_PROXY
-OBJS += src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).c
-include $(LOCAL_PATH)/eap_proxy_$(CONFIG_EAP_PROXY).mk
-endif
-
ifeq ($(CONFIG_TLS), openssl)
LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder
endif