diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-09 18:26:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-09 18:26:51 +0000 |
| commit | 7545accf1fbfad68f725386a3b60c2bbd02c61aa (patch) | |
| tree | eef3ca06ba444828e5d9b1130d812c8e34e7a4f8 /core/jni/Android.mk | |
| parent | b219eac8e827b034472cf885071b7e76ed6e4d60 (diff) | |
| parent | 6291beddfcdf843f07f12a6d4551301e5fcff73c (diff) | |
| download | frameworks_base-7545accf1fbfad68f725386a3b60c2bbd02c61aa.zip frameworks_base-7545accf1fbfad68f725386a3b60c2bbd02c61aa.tar.gz frameworks_base-7545accf1fbfad68f725386a3b60c2bbd02c61aa.tar.bz2 | |
am 6291bedd: am 63d43949: Merge "Use the icu:: namespace for icu4c API."
* commit '6291beddfcdf843f07f12a6d4551301e5fcff73c':
Use the icu:: namespace for icu4c API.
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 20ece24..45dce2c 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -22,6 +22,8 @@ endif LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CFLAGS += -DU_USING_ICU_NAMESPACE=0 + LOCAL_SRC_FILES:= \ AndroidRuntime.cpp \ com_android_internal_content_NativeLibraryHelper.cpp \ |