AOSP: keystore include directory difference

Upstream supports both the old and the new directory. Could be fine to
remove the old directory from upstream(?) to make these match.

This is related to this AOSP commit:

commit 07311dc4db7c5bbab9ebba7d3f9b9805e6ab7b24
Author: Kenny Root <kroot@google.com>
Date:   Wed Feb 15 15:08:06 2012 -0800

    Moving keystore to system/security

    keystore used to be in frameworks/base/cmds/keystore, but this include
    needs to be changed to support the move to system/security

    Change-Id: I583a193593576c2c3c7489fb8c27a29698e8a4c5

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 95bd9f18906cb5002eaa4d19d56fce859ef8ba90..82d07bf5cfc3927d8bc1bedc702e75bbd2998eab 100644 (file)
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -36,10 +36,7 @@ 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
+INCLUDES += system/security/keystore/include
 ifdef CONFIG_DRIVER_NL80211
 INCLUDES += external/libnl-headers
 endif

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 89fc4d187da526f1cdbdc0fb846f281b8573a0bc..e6794ea9c6cb22aa02070204cb89b119f3531293 100644 (file)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -58,9 +58,6 @@ 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
 INCLUDES += external/libnl-headers