diff options
| author | Ying Wang <wangying@google.com> | 2014-06-10 16:21:50 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-10 16:24:31 -0700 |
| commit | 6e85f8b0defe16ff24ecdce300c6a75ec689d05d (patch) | |
| tree | e4019f0daa54caa753afceaa25e714422a01f519 | |
| parent | e1b867dde77d59bb35f366c2e3d65fe37c696880 (diff) | |
| download | build-6e85f8b0defe16ff24ecdce300c6a75ec689d05d.zip build-6e85f8b0defe16ff24ecdce300c6a75ec689d05d.tar.gz build-6e85f8b0defe16ff24ecdce300c6a75ec689d05d.tar.bz2 | |
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.
Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
| -rw-r--r-- | core/clear_vars.mk | 3 | ||||
| -rw-r--r-- | core/host_executable.mk | 2 | ||||
| -rw-r--r-- | core/host_shared_library.mk | 2 | ||||
| -rw-r--r-- | core/host_static_library.mk | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 5d144d9..c6a09d8 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -152,9 +152,6 @@ LOCAL_MODULE_TARGET_ARCH_WARN:= LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:= LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:= LOCAL_MODULE_HOST_ARCH:= -LOCAL_MODULE_HOST_ARCH_WARN:= -LOCAL_MODULE_UNSUPPORTED_HOST_ARCH:= -LOCAL_MODULE_UNSUPPORTED_HOST_ARCH_WARN:= # arch specific variables LOCAL_SRC_FILES_$(TARGET_ARCH):= diff --git a/core/host_executable.mk b/core/host_executable.mk index 53b5fd1..bf3cde1 100644 --- a/core/host_executable.mk +++ b/core/host_executable.mk @@ -2,6 +2,7 @@ my_prefix := HOST_ include $(BUILD_SYSTEM)/multilib.mk +ifndef LOCAL_MODULE_HOST_ARCH ifndef my_module_multilib ifeq ($(HOST_PREFER_32_BIT),true) my_module_multilib := 32 @@ -10,6 +11,7 @@ else my_module_multilib := first endif endif +endif ifeq ($(my_module_multilib),both) ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),) diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index 2fdf61f..438a9ce 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -1,6 +1,7 @@ my_prefix := HOST_ include $(BUILD_SYSTEM)/multilib.mk +ifndef LOCAL_MODULE_HOST_ARCH ifndef my_module_multilib ifeq ($(HOST_PREFER_32_BIT),true) my_module_multilib := 32 @@ -9,6 +10,7 @@ else my_module_multilib := first endif endif +endif LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk diff --git a/core/host_static_library.mk b/core/host_static_library.mk index c40cf7d..74ac2ea 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -1,6 +1,7 @@ my_prefix := HOST_ include $(BUILD_SYSTEM)/multilib.mk +ifndef LOCAL_MODULE_HOST_ARCH ifndef my_module_multilib ifeq ($(HOST_PREFER_32_BIT),true) my_module_multilib := 32 @@ -9,6 +10,7 @@ else my_module_multilib := first endif endif +endif LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk |