diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-10 00:50:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-10 00:50:02 +0000 |
| commit | 5927a42653c9daa61ac85da83b6e20f20f0034d1 (patch) | |
| tree | f26f5358a35247396199db18749257716478c7ba /nci | |
| parent | 991df7abb3ea28f6999f0d271093f9f58eb2b10c (diff) | |
| parent | a4464d73d35e33b503e8032a5834318974a79243 (diff) | |
| download | android_packages_apps_Nfc-5927a42653c9daa61ac85da83b6e20f20f0034d1.tar.gz android_packages_apps_Nfc-5927a42653c9daa61ac85da83b6e20f20f0034d1.tar.bz2 android_packages_apps_Nfc-5927a42653c9daa61ac85da83b6e20f20f0034d1.zip | |
am a4464d73: am f62a9a00: Merge "Switch Nfc to the new icu."
* commit 'a4464d73d35e33b503e8032a5834318974a79243':
Switch Nfc to the new icu.
Diffstat (limited to 'nci')
| -rw-r--r-- | nci/jni/Android.mk | 4 |
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 \ |