| Message ID | CAH7ZN-zwyONhJpe7QnVSzCKp+PCaGNNwkVrvcBg1pHvE7NjXmA@mail.gmail.com |
|---|---|
| State | Deferred |
| Headers | show |
On Thu, Jan 29, 2015 at 11:07:18AM -0800, Dmitry Shmidt wrote: > The libcrypto and libssl modules (and their respective static and host > versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module > is sufficient. This breaks build with AOSP (android-5.0.2_r1) for me: external/wpa_supplicant_8/hostapd/src/crypto/crypto_openssl.c:10:30: fatal error: openssl/opensslv.h: No such file or directory #include <openssl/opensslv.h> (I don't see LOCAL_EXPORT_C_INCLUDE_DIRS anywhere in external/openssl at least as far as that specific snapshot from AOSP is concerned.)
On Fri, Jan 30, 2015 at 1:14 AM, Jouni Malinen <j@w1.fi> wrote: > On Thu, Jan 29, 2015 at 11:07:18AM -0800, Dmitry Shmidt wrote: >> The libcrypto and libssl modules (and their respective static and host >> versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module >> is sufficient. > > This breaks build with AOSP (android-5.0.2_r1) for me: > > external/wpa_supplicant_8/hostapd/src/crypto/crypto_openssl.c:10:30: fatal error: openssl/opensslv.h: No such file or directory > #include <openssl/opensslv.h> > > (I don't see LOCAL_EXPORT_C_INCLUDE_DIRS anywhere in external/openssl at > least as far as that specific snapshot from AOSP is concerned.) You are right, it is not backward-compatible with AOSP L-Release. I'll try to be more careful next time. Let's wait till next release then. > > -- > Jouni Malinen PGP id EFC895FA > _______________________________________________ > HostAP mailing list > HostAP@lists.shmoo.com > http://lists.shmoo.com/mailman/listinfo/hostap
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 6fcefdd..123d2c9 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -45,7 +45,6 @@ endif INCLUDES = $(LOCAL_PATH) INCLUDES += $(LOCAL_PATH)/src INCLUDES += $(LOCAL_PATH)/src/utils -INCLUDES += external/openssl/include INCLUDES += system/security/keystore/include ifdef CONFIG_DRIVER_NL80211 ifneq ($(wildcard external/libnl),) diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk index 2457e13..ced6d8d 100644 --- a/hs20/client/Android.mk +++ b/hs20/client/Android.mk @@ -4,7 +4,6 @@ INCLUDES = $(LOCAL_PATH) INCLUDES += $(LOCAL_PATH)/../../src/utils INCLUDES += $(LOCAL_PATH)/../../src/common INCLUDES += $(LOCAL_PATH)/../../src -INCLUDES += external/openssl/include INCLUDES += external/libxml2/include INCLUDES += external/curl/include INCLUDES += external/webkit/Source/WebKit/gtk diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 579582b..2ec99ad 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -61,7 +61,6 @@ INCLUDES += $(LOCAL_PATH)/src/rsn_supp INCLUDES += $(LOCAL_PATH)/src/tls INCLUDES += $(LOCAL_PATH)/src/utils INCLUDES += $(LOCAL_PATH)/src/wps -INCLUDES += external/openssl/include INCLUDES += system/security/keystore/include ifdef CONFIG_DRIVER_NL80211 ifneq ($(wildcard external/libnl),)