diff options
| author | Ying Wang <wangying@google.com> | 2014-05-20 14:43:51 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-20 18:03:21 -0700 |
| commit | 966c1e0cae6a59f15264d3b542af08e21e2dc06c (patch) | |
| tree | fc310007c15dd5de89d3fc7b3fe8eb6212039076 /core/host_static_library.mk | |
| parent | 4e151105a02ba09acb277c6a084252d01c561a5f (diff) | |
| download | build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.zip build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.tar.gz build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.tar.bz2 | |
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.
Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
Diffstat (limited to 'core/host_static_library.mk')
| -rw-r--r-- | core/host_static_library.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/host_static_library.mk b/core/host_static_library.mk index ab3f16e..c40cf7d 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -2,9 +2,13 @@ my_prefix := HOST_ include $(BUILD_SYSTEM)/multilib.mk 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 endif +endif LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk @@ -21,9 +25,6 @@ ifeq ($(my_module_arch_supported),true) OVERRIDE_BUILT_MODULE_PATH := LOCAL_BUILT_MODULE := LOCAL_INSTALLED_MODULE := -LOCAL_MODULE_STEM := -LOCAL_BUILT_MODULE_STEM := -LOCAL_INSTALLED_MODULE_STEM := LOCAL_INTERMEDIATE_TARGETS := include $(BUILD_SYSTEM)/host_static_library_internal.mk |