commit 918cec2c0c1cd4e104babb39af255b2885c39696
author Narayan Kamath <narayan@google.com> Thu Jan 08 10:20:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 08 10:20:03 2015 +0000
tree 3821e9311e45ef654e7dc1f24f4f6721f22e8431
parent 46b53da60cfa4fb20f1dbea81d3ab3f9661e47d1
parent 59c615015d880d7d4a0749b78073363512836401

am 59c61501: Merge "Remove hardcoded ICU include paths."

* commit '59c615015d880d7d4a0749b78073363512836401':
  Remove hardcoded ICU include paths.

hs20/client/Android.mk

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