commit fa3c26b862ca17c0d2db67606226b49d1648b4bf
author Christopher Ferris <cferris@google.com> Wed Jun 11 02:42:06 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 10 22:08:45 2014 +0000
tree c5dd0ddd010667427f861c39b684fcf3182eb30f
parent ab64e2aa4c8cd87e1a588018d57ede5533be0a23
parent e8981d1a842397174f786c510ffd6482b3723e84

Merge "Add LOCAL_MULTILIB := both for host targets."

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 5d2520a..65fa2b8 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -49,6 +49,7 @@
 LOCAL_C_INCLUDES := $(libgtest_host_includes)
 LOCAL_CFLAGS += $(libgtest_cflags)
 LOCAL_MODULE := libgtest_host
+LOCAL_MULTILIB := both
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -62,6 +63,7 @@
 LOCAL_C_INCLUDES := $(libgtest_host_includes)
 LOCAL_CFLAGS += $(libgtest_cflags)
 LOCAL_MODULE := libgtest_main_host
+LOCAL_MULTILIB := both
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -113,6 +115,7 @@
 LOCAL_C_INCLUDES := $(libgtest_host_includes)
 LOCAL_CFLAGS += $(libgtest_cflags)
 LOCAL_MODULE := libgtest_libc++_host
+LOCAL_MULTILIB := both
 
 include external/libcxx/libcxx.mk
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -128,6 +131,7 @@
 LOCAL_C_INCLUDES := $(libgtest_host_includes)
 LOCAL_CFLAGS += $(libgtest_cflags)
 LOCAL_MODULE := libgtest_main_libc++_host
+LOCAL_MULTILIB := both
 
 include external/libcxx/libcxx.mk
 include $(BUILD_HOST_STATIC_LIBRARY)