From: Dmitry Shmidt <dimitrysh@google.com>
Date: Wed, 16 Jul 2014 17:25:41 +0000 (-0700)
Subject: HS 2.0R2: Keep backward compatibility with old icu
X-Git-Tag: hostap_2_3~162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;ds=sidebyside;h=a5257a7a27102babec81b31b07941ec60b41af72;p=thirdparty%2Fhostap.git

HS 2.0R2: Keep backward compatibility with old icu

This allows hs20-osu-client to be build with additional Android
versions.

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

diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index b7bd93251..63cbc6f2a 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)