commit 045f3c0f38babb08ee0589064820abe158039ab5
author Ulas Kirazci <ulas@google.com> Tue Nov 26 18:02:17 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 26 18:02:18 2013 +0000
tree 55622a33add6fae4b48b4f2fcb82ba0bfc839478
parent 9a9b25f8d1b7fc1241e9fb903bd0a924d9091d70
parent 335a2ce546521cbc7d3a408838a0ec846a447618

Merge "Build the icu4c static library with U_STATIC_IMPLEMENTATION."

common/Android.mk

diff --git a/common/Android.mk b/common/Android.mk
index 4be2a54..7c8d0d4 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -185,6 +185,7 @@
 LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC -frtti
 # Using -Os over -O3 actually cuts down the final executable size by a few dozen kilobytes
 LOCAL_CFLAGS += -Os
+LOCAL_EXPORT_CFLAGS += -DU_STATIC_IMPLEMENTATION=1
 LOCAL_LDLIBS += $(local_ldlibs)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libicuuc_static

i18n/Android.mk

diff --git a/i18n/Android.mk b/i18n/Android.mk
index a359d8f..d769c8b 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -148,6 +148,7 @@
 LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC -frtti
 # Using -Os over -O3 actually cuts down the final executable size by a few dozen kilobytes
 LOCAL_CFLAGS += -Os
+LOCAL_EXPORT_CFLAGS += -DU_STATIC_IMPLEMENTATION=1
 LOCAL_LDLIBS += $(local_ldlibs)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libicui18n_static