diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-05 11:39:15 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-01-07 17:47:09 +0000 |
| commit | d4d66af904b88002e68c6382079d826d63a2eb72 (patch) | |
| tree | 729499dbdee81988fd2a916a8cb4fec8f2883e54 /hs20 | |
| parent | 907fe1cb0a32f78039e3a4ebe0c4b161da120061 (diff) | |
| download | android_external_wpa_supplicant_8-d4d66af904b88002e68c6382079d826d63a2eb72.tar.gz android_external_wpa_supplicant_8-d4d66af904b88002e68c6382079d826d63a2eb72.tar.bz2 android_external_wpa_supplicant_8-d4d66af904b88002e68c6382079d826d63a2eb72.zip | |
Remove hardcoded ICU include paths.
ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS.
bug: 18581021
Change-Id: I0a971ec93c529b9adb4056ba048eab09d96b6ff5
Diffstat (limited to 'hs20')
| -rw-r--r-- | hs20/client/Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk index 63cbc6f2..2457e138 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 |