commit 7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0
author Colin Cross <ccross@android.com> Thu Apr 09 20:47:15 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 09 20:47:16 2015 +0000
tree 0d6e0ced10ddefb683642b157eaa394ea66b608d
parent 42a3e879b63abeadf8fd09403ebb084a3ead887b
parent 9d59f417767991246848c3e101cb27d2dfea5988

Merge "Change the default multilib for host libraries to "both""

core/host_shared_library.mk

diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk
index 438a9ce..e840780 100644
--- a/core/host_shared_library.mk
+++ b/core/host_shared_library.mk
@@ -6,8 +6,8 @@
 ifeq ($(HOST_PREFER_32_BIT),true)
 my_module_multilib := 32
 else
-# By default we only build host module for the first arch.
-my_module_multilib := first
+# libraries default to building for both architecturess
+my_module_multilib := both
 endif
 endif
 endif

core/host_static_library.mk

diff --git a/core/host_static_library.mk b/core/host_static_library.mk
index 74ac2ea..52c42ef 100644
--- a/core/host_static_library.mk
+++ b/core/host_static_library.mk
@@ -6,8 +6,8 @@
 ifeq ($(HOST_PREFER_32_BIT),true)
 my_module_multilib := 32
 else
-# By default we only build host module for the first arch.
-my_module_multilib := first
+# libraries default to building for both architecturess
+my_module_multilib := both
 endif
 endif
 endif