Android: Fix CONFIG_EAP_PROXY option and move it to right place
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
parent
643fab30a0
commit
5e42035ed9
1 changed files with 7 additions and 6 deletions
|
@ -504,6 +504,13 @@ CONFIG_EAP_SIM_COMMON=y
|
||||||
NEED_AES_CBC=y
|
NEED_AES_CBC=y
|
||||||
endif
|
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
|
ifdef CONFIG_EAP_AKA_PRIME
|
||||||
# EAP-AKA'
|
# EAP-AKA'
|
||||||
ifeq ($(CONFIG_EAP_AKA_PRIME), dyn)
|
ifeq ($(CONFIG_EAP_AKA_PRIME), dyn)
|
||||||
|
@ -1550,12 +1557,6 @@ ifneq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)
|
||||||
LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB)
|
LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB)
|
||||||
endif
|
endif
|
||||||
LOCAL_SHARED_LIBRARIES := libc libcutils liblog
|
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)
|
ifeq ($(CONFIG_TLS), openssl)
|
||||||
LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder
|
LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue