Merge "Enable host multilib for ART testing."
diff --git a/common/Android.mk b/common/Android.mk
index a9ebcdf..59cf55c 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -169,6 +169,7 @@
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 344fd47..1436c48 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -145,6 +145,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libicui18n-host
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
#