From b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 10 Jun 2014 17:18:08 -0700 Subject: [PATCH] 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 | 5 +++++ core/host_static_library.mk | 5 +++++ 2 files changed, 10 insertions(+) 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 := ###########################################################