commit 33a7e04397a935a34524517a07ca027ddebdc495
author Ian Rogers <irogers@google.com> Wed Jun 25 03:54:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 25 03:54:40 2014 +0000
tree e1e0b888255f794653455cb80ee92543b2dca5ed
parent fdf7f349f5744b442e7c45d54c45342d0301c961
parent 60e4a65d7c30ea0b5456933db9a1aa75e4a3f645

am 60e4a65d: am 916c54b2: Merge "Enable host multilib for ART testing."

* commit '60e4a65d7c30ea0b5456933db9a1aa75e4a3f645':
  Enable host multilib for ART testing.

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index 675e8cc..0ae615e 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -127,6 +127,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
 LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host
 LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive-host libutils
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_SHARED_LIBRARY)
 
 ifeq ($(LIBCORE_SKIP_TESTS),)