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

* commit 'cec9dc14185dd1df6704a4af226ffbb2a1b9cd87':
  Don't rename host libraries if only one arch is build.
This commit is contained in:
Ying Wang 2014-06-11 00:24:10 +00:00 committed by Android Git Automerger
commit 49d9a894dc
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 :=
###########################################################