From f7579502a65d0868275dc476f946a6bf74cddf02 Mon Sep 17 00:00:00 2001 From: Naresh Jayaram Date: Tue, 3 Dec 2013 12:07:24 +0530 Subject: [PATCH] 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. Signed-hostap: Jouni Malinen --- wpa_supplicant/Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 373a344b4..a030a0bbf 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -504,7 +504,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 @@ -1559,6 +1559,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