aboutsummaryrefslogtreecommitdiffstats
path: root/hs20
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-05 11:39:15 (GMT)
committerJouni Malinen <j@w1.fi>2015-01-09 23:00:29 (GMT)
commit96d1d97af6fb5ba0b5eba6769e80d2af7e7d4539 (patch)
tree8be17403c025244cec87f2dc11abe22ccf583057 /hs20
parent2e1d7386e2766b57bc295702af543cc784a0d2be (diff)
downloadhostap-96d1d97af6fb5ba0b5eba6769e80d2af7e7d4539.zip
hostap-96d1d97af6fb5ba0b5eba6769e80d2af7e7d4539.tar.gz
hostap-96d1d97af6fb5ba0b5eba6769e80d2af7e7d4539.tar.bz2
Android: Remove hardcoded ICU include paths from hs20-osu-client
ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'hs20')
-rw-r--r--hs20/client/Android.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index 63cbc6f..2457e13 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -8,9 +8,12 @@ INCLUDES += external/openssl/include
INCLUDES += external/libxml2/include
INCLUDES += external/curl/include
INCLUDES += external/webkit/Source/WebKit/gtk
-ifneq ($(wildcard external/icu),)
-INCLUDES += external/icu/icu4c/source/common
-else
+
+# We try to keep this compiling against older platform versions.
+# The new icu location (external/icu) exports its own headers, but
+# the older versions in external/icu4c don't, and we need to add those
+# headers to the include path by hand.
+ifeq ($(wildcard external/icu),)
INCLUDES += external/icu4c/common
endif