diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-07-12 02:08:27 +0100 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-01 19:40:34 +0200 |
| commit | cd1d18c8d35d85058dbf801cdf96f59153a1de59 (patch) | |
| tree | 67b086edad5c530c70706294e4be6e08ea5d76ac | |
| parent | a0574a600e92178b1b7156d255226dfd369f9ca2 (diff) | |
| download | android_external_wpa_supplicant_8-cd1d18c8d35d85058dbf801cdf96f59153a1de59.tar.gz android_external_wpa_supplicant_8-cd1d18c8d35d85058dbf801cdf96f59153a1de59.tar.bz2 android_external_wpa_supplicant_8-cd1d18c8d35d85058dbf801cdf96f59153a1de59.zip | |
eap_peer: Make the QMI EAP proxy a standalone lib
This code can't be built without linking to some proprietary libs
and headers. Split it off so a prebuilt can be distributed for
OSS builds
Ref: CYNGNOS-428
Change-Id: I430dda72e8cb156d86ef286244230bb3f511ca23
Fix dependencies
Change-Id: I86c5e41e4d6987e432cb2f129ad585149228b04a
wpa_supplicant: Remove unnecessary QMI linkage
* The QMI libraries are linked with the intermediate lib, we don't
need to link them directly to the executable.
Change-Id: Ifedf5c480af6b5f0309cd36da719e98ae3a69750
| -rw-r--r-- | src/eap_peer/eap_proxy_qmi.c | 2 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 34 |
2 files changed, 36 insertions, 0 deletions
diff --git a/src/eap_peer/eap_proxy_qmi.c b/src/eap_peer/eap_proxy_qmi.c index bd132cff..b1bf2b3c 100644 --- a/src/eap_peer/eap_proxy_qmi.c +++ b/src/eap_peer/eap_proxy_qmi.c @@ -1563,6 +1563,8 @@ static char bin_to_hexchar(u8 ch) } return ch + 'a' - 10; } + +extern struct eap_peer_config * eap_get_config(struct eap_sm *sm) __attribute__((weak)); static Boolean eap_proxy_build_identity(struct eap_proxy_sm *eap_proxy, u8 id, struct eap_sm *eap_sm) { struct eap_hdr *resp; diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index f65076c7..d4841ad5 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -550,7 +550,11 @@ endif ifdef CONFIG_EAP_PROXY L_CFLAGS += -DCONFIG_EAP_PROXY +ifneq ($(CONFIG_EAP_PROXY),qmi) +# QMI needs proprietary headers to build :( +# Spin it into a blobbable lib OBJS += src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).c +endif include $(LOCAL_PATH)/eap_proxy_$(CONFIG_EAP_PROXY).mk CONFIG_IEEE8021X_EAPOL=y endif @@ -1556,6 +1560,32 @@ LOCAL_SRC_FILES := $(OBJS_c) LOCAL_C_INCLUDES := $(INCLUDES) include $(BUILD_EXECUTABLE) +# This needs QMI artifacts to be built +ifneq ($(QCPATH),) + +ifeq ($(CONFIG_EAP_PROXY),qmi) +include $(CLEAR_VARS) + +LOCAL_MODULE = libwpa_qmi_eap_proxy +LOCAL_SHARED_LIBRARIES := libcutils liblog libwpa_client +LOCAL_SRC_FILES += src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).c +LOCAL_SRC_FILES += src/utils/wpa_debug.c +LOCAL_SRC_FILES += src/utils/wpabuf.c +LOCAL_SRC_FILES += src/utils/eloop.c +LOCAL_SRC_FILES += src/utils/common.c +include $(LOCAL_PATH)/eap_proxy_$(CONFIG_EAP_PROXY).mk +LOCAL_C_INCLUDES := $(INCLUDES) +LOCAL_CFLAGS = $(L_CFLAGS) + +LOCAL_STATIC_LIBRARIES += $(LIB_STATIC_EAP_PROXY) +LOCAL_SHARED_LIBRARIES += $(LIB_SHARED_EAP_PROXY) + +include $(BUILD_SHARED_LIBRARY) + +endif # qmi EAP_PROXY +endif # QCPATH + + ######################## include $(CLEAR_VARS) LOCAL_MODULE := wpa_supplicant @@ -1567,8 +1597,12 @@ LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB) endif LOCAL_SHARED_LIBRARIES := libc libcutils liblog ifdef CONFIG_EAP_PROXY +ifneq ($(CONFIG_EAP_PROXY),qmi) LOCAL_STATIC_LIBRARIES += $(LIB_STATIC_EAP_PROXY) LOCAL_SHARED_LIBRARIES += $(LIB_SHARED_EAP_PROXY) +else +LOCAL_SHARED_LIBRARIES += libwpa_qmi_eap_proxy +endif endif ifeq ($(CONFIG_TLS), openssl) LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder |