aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-17 01:43:12 -0700
committerIan Rogers <irogers@google.com>2014-06-17 01:43:12 -0700
commitec96ab9210ad3ecd659405608e1fca4901ce18d3 (patch)
tree1f4afadcb3ac3edaf900e38c8d5dd963afce4d0c
parente04e5980f1a4ae5efec53fd9e2e3ba1c15ea0aee (diff)
downloadicu4c-ec96ab9210ad3ecd659405608e1fca4901ce18d3.tar.gz
Enable host multilib for ART testing.
Change-Id: If852951c2ba08de2542e18c0205ee90b19ebbf8e
-rw-r--r--common/Android.mk1
-rw-r--r--i18n/Android.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/common/Android.mk b/common/Android.mk
index a9ebcdf7..59cf55c6 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -169,6 +169,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libicuuc-host
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
LOCAL_REQUIRED_MODULES += icu-data-host
+LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
#
diff --git a/i18n/Android.mk b/i18n/Android.mk
index 344fd47f..1436c48b 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -145,6 +145,7 @@ LOCAL_LDLIBS += -lm -lpthread
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libicui18n-host
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
#