From: Jouni Malinen Date: Sat, 18 May 2013 09:03:35 +0000 (+0300) Subject: Android: Clarify keystore include directories X-Git-Tag: aosp-kk-from-upstream~246 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b83b1b2da8dd0eca35708e38e7515903396f4461;p=thirdparty%2Fhostap.git Android: Clarify keystore include directories This updates hostapd to build using the new keystore header file location and adds a note that the old frameworks/base/cmds/keystore can be removed at some point in the future when old Android releases do not need to be supported. Signed-hostap: Jouni Malinen --- diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 934c238ae..98371044f 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -39,7 +39,10 @@ INCLUDES = $(LOCAL_PATH) INCLUDES += $(LOCAL_PATH)/src INCLUDES += $(LOCAL_PATH)/src/utils INCLUDES += external/openssl/include +# frameworks/base/cmds/keystore is the old location and can be dropped at some +# point INCLUDES += frameworks/base/cmds/keystore +INCLUDES += system/security/keystore ifdef CONFIG_DRIVER_NL80211 INCLUDES += external/libnl-headers endif diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index ffbddbe8c..443e0c07f 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -63,6 +63,8 @@ INCLUDES += $(LOCAL_PATH)/src/tls INCLUDES += $(LOCAL_PATH)/src/utils INCLUDES += $(LOCAL_PATH)/src/wps INCLUDES += external/openssl/include +# frameworks/base/cmds/keystore is the old location and can be dropped at some +# point INCLUDES += frameworks/base/cmds/keystore INCLUDES += system/security/keystore ifdef CONFIG_DRIVER_NL80211