diff options
Diffstat (limited to 'hs20')
| -rw-r--r-- | hs20/client/Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk index 212aefe4..b23ac17b 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 else # The LOCAL_EXPORT_C_INCLUDE_DIRS from ICU did not seem to fully resolve the |