From 966c1e0cae6a59f15264d3b542af08e21e2dc06c Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 20 May 2014 14:43:51 -0700 Subject: 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 --- core/base_rules.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'core/base_rules.mk') diff --git a/core/base_rules.mk b/core/base_rules.mk index 801e2c8..8b3614a 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -173,11 +173,11 @@ ifdef OVERRIDE_BUILT_MODULE_PATH else built_module_path := $(intermediates) endif -LOCAL_BUILT_MODULE := $(built_module_path)/$(LOCAL_BUILT_MODULE_STEM) +LOCAL_BUILT_MODULE := $(built_module_path)/$(my_built_module_stem) built_module_path := ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) - LOCAL_INSTALLED_MODULE := $(my_module_path)/$(LOCAL_INSTALLED_MODULE_STEM) + LOCAL_INSTALLED_MODULE := $(my_module_path)/$(my_installed_module_stem) endif # Assemble the list of targets to create PRIVATE_ variables for. @@ -569,10 +569,12 @@ endif ifdef LOCAL_DONT_CHECK_MODULE LOCAL_CHECKED_MODULE := endif -# Don't check build the module defined for the 2nd arch +# Don't check build target module defined for the 2nd arch +ifndef LOCAL_IS_HOST_MODULE ifdef LOCAL_2ND_ARCH_VAR_PREFIX LOCAL_CHECKED_MODULE := endif +endif ########################################################### ## Register with ALL_MODULES -- cgit v1.1