Merge "Add LOCAL_MULTILIB := both for host targets."
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)