commit 09e996ad0c1f693e52dc8aa108fbdb0dba4968e1
author Narayan Kamath <narayan@google.com> Thu Jan 08 10:27:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 08 10:27:09 2015 +0000
tree 462fae26c806a426578173b4b9e0df5db9d3e9b8
parent fb45fd5cfed8bdccd0859c7fc05449fc187e2d06
parent 918cec2c0c1cd4e104babb39af255b2885c39696

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

* commit '918cec2c0c1cd4e104babb39af255b2885c39696':
  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