From 96d1d97af6fb5ba0b5eba6769e80d2af7e7d4539 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Mon, 5 Jan 2015 11:39:15 +0000 Subject: [PATCH] Android: Remove hardcoded ICU include paths from hs20-osu-client ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS. Signed-off-by: Dmitry Shmidt --- hs20/client/Android.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk index 63cbc6f2a..2457e138a 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