aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaresh Jayaram <c_njayar@qti.qualcomm.com>2013-12-03 12:07:24 +0530
committerSteve Kondik <shade@chemlab.org>2014-06-12 14:07:28 -0700
commit89bce6568b26b3fefa6d2ac1e75c678c4a176db3 (patch)
treed35f64b66de20a7da3eecc8684e7bd9926cbcf89
parent2ca99822cbbee1e9d26ec0dfd46b1630e84eec8b (diff)
downloadandroid_external_wpa_supplicant_8-89bce6568b26b3fefa6d2ac1e75c678c4a176db3.tar.gz
android_external_wpa_supplicant_8-89bce6568b26b3fefa6d2ac1e75c678c4a176db3.tar.bz2
android_external_wpa_supplicant_8-89bce6568b26b3fefa6d2ac1e75c678c4a176db3.zip
eap_proxy: Extend Android.mk to support additional libraries
Allow addition static and shared libraries to be specified from the eap_proxy_*.mk file for Android build. In addition use $(LOCAL_PATH) as a prefix for that Android makefile part. Change-Id: Ie441bc3280addedc9916eab587dd78d58957da2b CRs-fixed: 585456 Git-commit: f7579502a65d0868275dc476f946a6bf74cddf02 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
-rw-r--r--wpa_supplicant/Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index ea81ab25..45a9a13a 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -515,7 +515,7 @@ 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
+include $(LOCAL_PATH)/eap_proxy_$(CONFIG_EAP_PROXY).mk
CONFIG_IEEE8021X_EAPOL=y
endif
@@ -1560,6 +1560,10 @@ 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
+LOCAL_STATIC_LIBRARIES += $(LIB_STATIC_EAP_PROXY)
+LOCAL_SHARED_LIBRARIES += $(LIB_SHARED_EAP_PROXY)
+endif
ifeq ($(CONFIG_TLS), openssl)
LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder
endif