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>

diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index 63cbc6f2a085433a0affb2f682d53bc7607a9ccf..2457e138a125ba59dc9caa6b36370de36915ab7d 100644 (file)
--- 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