commit 2587038ae14023e7e597491e5de02e0361fa6452
author Dmitry Shmidt <dimitrysh@google.com> Tue Feb 21 16:16:49 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 16:16:49 2012 -0800
tree 991061e287efb53b60d3f877654723a0aac2fe56
parent 07311dc4db7c5bbab9ebba7d3f9b9805e6ab7b24
parent ea01dacb439e7c408e647f9a7c42f93abe3baaf0

Merge "Add PLATFORM_VERSION to VERSION_STR_POSTFIX definition"

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 14d2ccd..5a54fc2 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -72,7 +72,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