diff options
| author | Ying Wang <wangying@google.com> | 2014-05-23 19:43:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 19:43:57 +0000 |
| commit | 1dc4f0bacef15631d5390af4ee0b898e0e07c9d5 (patch) | |
| tree | 45be57ea46ade99a6fe02356d63eab0925d52925 /core/base_rules.mk | |
| parent | 554cd62ffa29f71a61819353f3f05a899982eaf8 (diff) | |
| parent | 2bf10a72f87a8e97923286aa331f7db81e2361ca (diff) | |
| download | build-1dc4f0bacef15631d5390af4ee0b898e0e07c9d5.zip build-1dc4f0bacef15631d5390af4ee0b898e0e07c9d5.tar.gz build-1dc4f0bacef15631d5390af4ee0b898e0e07c9d5.tar.bz2 | |
am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '2bf10a72f87a8e97923286aa331f7db81e2361ca':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 9571001..548ed13 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -175,11 +175,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. @@ -571,10 +571,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 |