diff options
| author | Ying Wang <wangying@google.com> | 2014-05-23 17:48:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 17:48:27 +0000 |
| commit | 2bf10a72f87a8e97923286aa331f7db81e2361ca (patch) | |
| tree | 9cf3f90fee7d8e8185268054164e2395d958a2ce /core/base_rules.mk | |
| parent | 8758e0cdf0f9d41c420ef64c8362788707fd378c (diff) | |
| parent | cdcb6926d40b502ed89a285cdd4d99beb4cf8009 (diff) | |
| download | build-2bf10a72f87a8e97923286aa331f7db81e2361ca.zip build-2bf10a72f87a8e97923286aa331f7db81e2361ca.tar.gz build-2bf10a72f87a8e97923286aa331f7db81e2361ca.tar.bz2 | |
am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit 'cdcb6926d40b502ed89a285cdd4d99beb4cf8009':
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 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 |