commit 1a77b9a60c9b34a0a0c54c8015515e5d1d4c9e3c
author Ian Rogers <irogers@google.com> Sun Jun 22 05:01:40 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Jun 22 03:00:00 2014 +0000
tree 1f4afadcb3ac3edaf900e38c8d5dd963afce4d0c
parent e04e5980f1a4ae5efec53fd9e2e3ba1c15ea0aee
parent ec96ab9210ad3ecd659405608e1fca4901ce18d3

Merge "Enable host multilib for ART testing."

common/Android.mk

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)
 
 #

i18n/Android.mk

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)
 
 #