am 19aa2837: am 49d9a894: am cec9dc14: Merge "Don\'t rename host libraries if only one arch is build."

* commit '19aa28379f86b0938b3c6bef41ca6b89b6d91711':
  Don't rename host libraries if only one arch is build.
This commit is contained in:
Ying Wang 2014-06-11 20:49:51 +00:00 committed by Android Git Automerger
commit 1f5a7c21de
2 changed files with 10 additions and 0 deletions

View File

@ -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 :=
###########################################################

View File

@ -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 :=
###########################################################