Patchwork HS20: Keep backward compatibility with old icu

login
register
mail settings
Submitter Dmitry Shmidt
Date July 16, 2014, 5:25 p.m.
Message ID <20140716174003.0BD9313FE90@ushik.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/370820/
State Accepted
Headers show

Comments

Dmitry Shmidt - July 16, 2014, 5:25 p.m.
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
 hs20/client/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)
Jouni Malinen - July 26, 2014, 6:26 p.m.
Thanks, applied.

Patch

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