commit 46f567464e6031521ba50ff7e32770bab6c31ec8
author Brian Carlstrom <bdc@google.com> Thu May 02 16:08:01 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 02 16:08:02 2013 +0000
tree 1b8410ce24c8cca4e99f27c562ff5676eb46b6ae
parent 72debbe480a62fe0aa4593748821335dd46c8a88
parent fe958eee8964fbe6537985d7e593fdd1ab5d5e60

Merge "Give unique name to host build shared libraries"

common/Android.mk

diff --git a/common/Android.mk b/common/Android.mk
index 8ed0928..e9a4e14 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -165,6 +165,6 @@
     LOCAL_LDLIBS += $(local_ldlibs)
     LOCAL_ADDITIONAL_DEPENDENCIES += $(HOST_OUT)/usr/icu/$(root).dat
     LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE := libicuuc
+    LOCAL_MODULE := libicuuc-host
     include $(BUILD_HOST_SHARED_LIBRARY)
 endif

i18n/Android.mk

diff --git a/i18n/Android.mk b/i18n/Android.mk
index 1a14230..a7bf5b4 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -120,9 +120,9 @@
     LOCAL_SRC_FILES := $(src_files)
     LOCAL_C_INCLUDES := $(c_includes)
     LOCAL_CFLAGS += $(local_cflags)
-    LOCAL_SHARED_LIBRARIES += libicuuc
+    LOCAL_SHARED_LIBRARIES += libicuuc-host
     LOCAL_LDLIBS += $(local_ldlibs)
     LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE := libicui18n
+    LOCAL_MODULE := libicui18n-host
     include $(BUILD_HOST_SHARED_LIBRARY)
 endif