commit 30e144f32477cf3aaf9063b8f63bab9cc31621b7
author Dmitry Shmidt <dimitrysh@google.com> Tue Feb 21 16:35:19 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 16:35:19 2012 -0800
tree 16d6c34ab966fce4396ff733802e279c5c912c91
parent 2587038ae14023e7e597491e5de02e0361fa6452
parent 006dedfbfff3ecae6996e5eb85240e42b0e6a7a4

Merge "wpa_supplicant: Change option CONFIG_ROAMING to CONFIG_NO_ROAMING"

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 255c802..dfff085 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -37,7 +37,7 @@
 INCLUDES += $(LOCAL_PATH)/src
 INCLUDES += $(LOCAL_PATH)/src/utils
 INCLUDES += external/openssl/include
-INCLUDES += frameworks/base/cmds/keystore
+INCLUDES += system/security/keystore
 ifdef CONFIG_DRIVER_NL80211
 INCLUDES += external/libnl-headers
 endif

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 4a28717..148a6d7 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -77,7 +77,7 @@
 INCLUDES += $(LOCAL_PATH)/src/utils
 INCLUDES += $(LOCAL_PATH)/src/wps
 INCLUDES += external/openssl/include
-INCLUDES += frameworks/base/cmds/keystore
+INCLUDES += system/security/keystore
 ifdef CONFIG_DRIVER_NL80211
 INCLUDES += external/libnl-headers
 endif