diff mbox

Remove hardcoded ICU include paths.

Message ID CAH7ZN-zBcQVZOEPXnd8Qy09Q0-yuT98BFh1fCpt8aP3Jh8bFNw@mail.gmail.com
State Accepted
Headers show

Commit Message

Dmitry Shmidt Jan. 8, 2015, 6:55 p.m. UTC 
From: Narayan Kamath <narayan@google.com>
Date: Mon, 5 Jan 2015 11:39:15 +0000
Subject: [PATCH] Remove hardcoded ICU include paths.

ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS.

bug: 18581021
Change-Id: I0a971ec93c529b9adb4056ba048eab09d96b6ff5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
 hs20/client/Android.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--.
2.2.0.rc0.207.ga3a616c

Comments

Jouni Malinen Jan. 10, 2015, 4:01 p.m. UTC | #1 
On Thu, Jan 08, 2015 at 10:55:30AM -0800, Dmitry Shmidt wrote:
> Subject: [PATCH] Remove hardcoded ICU include paths.
> 
> ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS.

Thanks, applied.
diff mbox

Patch

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/openssl/include
 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
.