commit b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e
author Ying Wang <wangying@google.com> Tue Jun 10 17:18:08 2014 -0700
committer Ying Wang <wangying@google.com> Tue Jun 10 17:18:08 2014 -0700
tree 6a2a51a70abcdc06c7043f9fc398c54a79cb0359
parent a45a5d27972070895001571b7912655b0bd0931c

Don't rename host libraries if only one arch is build.

This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.

Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5

core/host_shared_library.mk

diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk
index 438a9ce..ae596df 100644
--- a/core/host_shared_library.mk
+++ b/core/host_shared_library.mk
@@ -12,6 +12,10 @@
 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 @@
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 endif  # HOST_2ND_ARCH
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
 my_module_arch_supported :=
 
 ###########################################################

core/host_static_library.mk

diff --git a/core/host_static_library.mk b/core/host_static_library.mk
index 74ac2ea..dc22c08 100644
--- a/core/host_static_library.mk
+++ b/core/host_static_library.mk
@@ -12,6 +12,10 @@
 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 @@
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 endif  # HOST_2ND_ARCH
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
 my_module_arch_supported :=
 
 ###########################################################