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/configure_module_stem.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/configure_module_stem.mk')
| -rw-r--r-- | core/configure_module_stem.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/core/configure_module_stem.mk b/core/configure_module_stem.mk index 1560055..48b7787 100644 --- a/core/configure_module_stem.mk +++ b/core/configure_module_stem.mk @@ -1,16 +1,20 @@ my_multilib_stem := $(LOCAL_MODULE_STEM_$(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32)) ifdef my_multilib_stem -LOCAL_MODULE_STEM := $(my_multilib_stem) + my_module_stem := $(my_multilib_stem) +else ifdef LOCAL_MODULE_STEM + my_module_stem := $(LOCAL_MODULE_STEM) +else + my_module_stem := $(LOCAL_MODULE) endif -ifndef LOCAL_MODULE_STEM - LOCAL_MODULE_STEM := $(LOCAL_MODULE) +ifdef LOCAL_BUILT_MODULE_STEM + my_built_module_stem := $(LOCAL_BUILT_MODULE_STEM) +else + my_built_module_stem := $(my_module_stem)$(LOCAL_MODULE_SUFFIX) endif -ifndef LOCAL_BUILT_MODULE_STEM - LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX) -endif - -ifndef LOCAL_INSTALLED_MODULE_STEM - LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX) +ifdef LOCAL_INSTALLED_MODULE_STEM + my_installed_module_stem := $(LOCAL_INSTALLED_MODULE_STEM) +else + my_installed_module_stem := $(my_module_stem)$(LOCAL_MODULE_SUFFIX) endif |