summaryrefslogtreecommitdiffstats
path: root/nci
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-09 17:06:31 -0700
committerElliott Hughes <enh@google.com>2014-07-09 17:06:31 -0700
commitbf2d81cd310663fa986c65102bc9b895386c3494 (patch)
treedee27998bf5c959dd1d05cc593a1907080f366bb /nci
parent4f4e0ca516efde8ed4c4440c08517e65463b3711 (diff)
downloadandroid_packages_apps_Nfc-bf2d81cd310663fa986c65102bc9b895386c3494.tar.gz
android_packages_apps_Nfc-bf2d81cd310663fa986c65102bc9b895386c3494.tar.bz2
android_packages_apps_Nfc-bf2d81cd310663fa986c65102bc9b895386c3494.zip
Switch Nfc to the new icu.
Change-Id: Ifb733ecb6065857ea5d5346e799638e1e03c1729
Diffstat (limited to 'nci')
-rw-r--r--nci/jni/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk
index c84ca1a5..8d65bfc2 100644
--- a/nci/jni/Android.mk
+++ b/nci/jni/Android.mk
@@ -24,9 +24,9 @@ LOCAL_SRC_FILES:= $(call all-cpp-files-under, .)
LOCAL_C_INCLUDES += \
bionic \
bionic/libstdc++ \
- external/stlport/stlport \
+ external/icu/icu4c/source/common \
external/libxml2/include \
- external/icu4c/common \
+ external/stlport/stlport \
frameworks/native/include \
libcore/include \
$(NFA)/include \