diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 00:21:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 22:15:14 +0000 |
| commit | cec9dc14185dd1df6704a4af226ffbb2a1b9cd87 (patch) | |
| tree | 6a2a51a70abcdc06c7043f9fc398c54a79cb0359 | |
| parent | a45a5d27972070895001571b7912655b0bd0931c (diff) | |
| parent | b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e (diff) | |
| download | build-cec9dc14185dd1df6704a4af226ffbb2a1b9cd87.tar.gz | |
Merge "Don't rename host libraries if only one arch is build."
| -rw-r--r-- | core/host_shared_library.mk | 5 | ||||
| -rw-r--r-- | core/host_static_library.mk | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index 438a9ce3d2..ae596df2d2 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -12,6 +12,10 @@ endif endif endif +ifneq ($(my_module_multilib),both) +LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true +endif + LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk @@ -34,6 +38,7 @@ endif LOCAL_2ND_ARCH_VAR_PREFIX := endif # HOST_2ND_ARCH +LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := my_module_arch_supported := ########################################################### diff --git a/core/host_static_library.mk b/core/host_static_library.mk index 74ac2ea66f..dc22c08b4f 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -12,6 +12,10 @@ endif endif endif +ifneq ($(my_module_multilib),both) +LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true +endif + LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk @@ -34,6 +38,7 @@ endif LOCAL_2ND_ARCH_VAR_PREFIX := endif # HOST_2ND_ARCH +LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := my_module_arch_supported := ########################################################### |