diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-10 17:15:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-10 17:15:42 +0000 |
| commit | 126d89bb79afb9636b79688e3d95fb2fc79ddd3b (patch) | |
| tree | 093749fe59306a4a7be0198b6a2b48918853d63e /core/jni/Android.mk | |
| parent | edacf22ca132ac48207a68aa30998f5b43d893b8 (diff) | |
| parent | c0b8f647ca3e3d698b75084b1b555b7af00aec5f (diff) | |
| download | frameworks_base-126d89bb79afb9636b79688e3d95fb2fc79ddd3b.zip frameworks_base-126d89bb79afb9636b79688e3d95fb2fc79ddd3b.tar.gz frameworks_base-126d89bb79afb9636b79688e3d95fb2fc79ddd3b.tar.bz2 | |
Merge "resolved conflicts for merge of 7545accf to master"
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 9d76335..30a7e68 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -18,6 +18,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 \ |