commit 7abb852a009dff5a3fea6e9c89730a6352fe44fd
author Dmitry Shmidt <dimitrysh@google.com> Wed Jul 16 10:22:54 2014 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Wed Jul 16 17:23:54 2014 +0000
tree 8bae500ec288e64e9b58b1018f073490ce6e6757
parent 2e67f06149ff649fb6f8782bad041d3d9124685e

HS20: Keep backward compatibility with old icu

Change-Id: I3eb3960331fcf4e6e7c2562a278be62ecf3a85d7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

hs20/client/Android.mk

diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index 22c73d3..63cbc6f 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -8,7 +8,11 @@
 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
+INCLUDES += external/icu4c/common
+endif
 
 
 #GTKCFLAGS := $(shell pkg-config --cflags gtk+-2.0 webkit-1.0)