am 4706eb3f: am c72592b7: am b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
* commit '4706eb3f223890d4578a234c8ca786570f00f3a7':
Revert "Don't rename host libraries if only one arch is build."
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 :=
###########################################################
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 :=
###########################################################