From 9d59f417767991246848c3e101cb27d2dfea5988 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 7 Apr 2015 15:11:37 -0700 Subject: [PATCH] Change the default multilib for host libraries to "both" Change host library builds to build for both architectures to match device builds, removing the need for LOCAL_MULTILIB := both in all the art library makefiles. Change-Id: I2689f67c66f5055f93941f40b3e825127f693eca --- core/host_shared_library.mk | 4 ++-- core/host_static_library.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index 438a9ce3d2..e84078013e 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -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 diff --git a/core/host_static_library.mk b/core/host_static_library.mk index 74ac2ea66f..52c42ef931 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -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