From dbd10da810da226fa605aa771a8bb3436a43be0a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 19 Feb 2015 12:48:00 +0200 Subject: [PATCH] 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 --- hs20/client/Android.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk index 2457e138a..1f2dfd214 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