Merge changes If51126b8,I05322cf0
* changes:
wpa_supplicant: Change wpa_supplicant.conf template name
Move .config for Android to android.config
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 5fd7d3f..33e69d9 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
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 467a91d..3c4ca77 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