summaryrefslogtreecommitdiffstats
path: root/NativeCode.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-03-06 12:23:34 -0800
committerElliott Hughes <enh@google.com>2015-03-06 12:23:34 -0800
commita04b5c3d39232c7616591883ee2124520e3ab622 (patch)
tree2e16d3a26438e9e7e25635a92e1ffa221d71fda9 /NativeCode.mk
parentf6681759e51d8e22f871a0f826baab53e02717f1 (diff)
downloadlibcore-a04b5c3d39232c7616591883ee2124520e3ab622.zip
libcore-a04b5c3d39232c7616591883ee2124520e3ab622.tar.gz
libcore-a04b5c3d39232c7616591883ee2124520e3ab622.tar.bz2
Explicitly specify the icu:: namespace.
Bug: 15350832 Change-Id: I8d84f3e50b643806ccf01190797c69ce6445b539
Diffstat (limited to 'NativeCode.mk')
-rw-r--r--NativeCode.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/NativeCode.mk b/NativeCode.mk
index 7bdac5a..1449e30 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -67,7 +67,7 @@ core_c_includes := libcore/include $(LOCAL_C_INCLUDES)
core_shared_libraries := $(LOCAL_SHARED_LIBRARIES)
core_static_libraries := $(LOCAL_STATIC_LIBRARIES)
core_cflags := $(LOCAL_CFLAGS) -Wall -Wextra -Werror
-core_cppflags += -std=gnu++11
+core_cppflags += -std=gnu++11 -DU_USING_ICU_NAMESPACE=0
core_test_files := \
luni/src/test/native/dalvik_system_JniTest.cpp \