am "am "Cumulative patch from commit 2c0efd9e49b15da163cee659409eee85390620c3""
merged from goog/mirror-m-wireless-internal-release
912d96b am "Cumulative patch from commit 2c0efd9e49b15da163cee659409eee85390620c3"
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index 63cbc6f..2457e13 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -8,9 +8,12 @@
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
+
+# We try to keep this compiling against older platform versions.
+# The new icu location (external/icu) exports its own headers, but
+# the older versions in external/icu4c don't, and we need to add those
+# headers to the include path by hand.
+ifeq ($(wildcard external/icu),)
INCLUDES += external/icu4c/common
endif