commit b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c
author Ying Wang <wangying@android.com> Wed Jun 11 01:12:28 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 10 22:08:45 2014 +0000
tree 54e2b57eaa957eb257cdabf2c9ff71c30a513592
parent c34f37c7b5d26e58a9666fc277379111a7c2ea4f
parent 532f1127af494ea9ec59e588d080846ed7b99e75

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

core/host_shared_library.mk

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