am 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""

* commit '7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0':
  Change the default multilib for host libraries to "both"
This commit is contained in:
Colin Cross 2015-04-09 20:55:01 +00:00 committed by Android Git Automerger
commit c0a70d889f
2 changed files with 4 additions and 4 deletions

View File

@ -6,8 +6,8 @@ ifndef my_module_multilib
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

View File

@ -6,8 +6,8 @@ ifndef my_module_multilib
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