aboutsummaryrefslogtreecommitdiffstats
path: root/hs20
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-02-19 10:48:00 (GMT)
committerJouni Malinen <j@w1.fi>2015-02-19 10:48:00 (GMT)
commitdbd10da810da226fa605aa771a8bb3436a43be0a (patch)
tree8f6dc5b6f26c57c899b8627391008696b50a4ffc /hs20
parenta926295a553585233aab3cf12a9353b008b10799 (diff)
downloadhostap-dbd10da810da226fa605aa771a8bb3436a43be0a.zip
hostap-dbd10da810da226fa605aa771a8bb3436a43be0a.tar.gz
hostap-dbd10da810da226fa605aa771a8bb3436a43be0a.tar.bz2
Android: Fix hs20-osu-client build on Android 5.0
The LOCAL_EXPORT_C_INCLUDE_DIRS from ICU did not seem to fully resolve the build (e.g., "mm -B" failed to build, but following that with "mm" allowed the build to complete). For now, add the include directory manually here for Android 5.0. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'hs20')
-rw-r--r--hs20/client/Android.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index 2457e13..1f2dfd2 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -15,6 +15,15 @@ INCLUDES += external/webkit/Source/WebKit/gtk
# 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
+# build (e.g., "mm -B" failed to build, but following that with "mm" allowed
+# the build to complete). For now, add the include directory manually here for
+# Android 5.0.
+ver = $(filter 5.0%,$(PLATFORM_VERSION))
+ifneq (,$(strip $(ver)))
+INCLUDES += external/icu/icu4c/source/common
+endif
endif