p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted 

Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.

Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
This commit is contained in:
Ying Wang 2014-06-10 16:21:50 -07:00
parent e1b867dde7
commit 6e85f8b0de
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/clear_vars.mk
View File

@ -152,9 +152,6 @@ LOCAL_MODULE_TARGET_ARCH_WARN:=
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:= LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:=
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:= LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:=
LOCAL_MODULE_HOST_ARCH:= LOCAL_MODULE_HOST_ARCH:=
LOCAL_MODULE_HOST_ARCH_WARN:=
LOCAL_MODULE_UNSUPPORTED_HOST_ARCH:=
LOCAL_MODULE_UNSUPPORTED_HOST_ARCH_WARN:=
# arch specific variables # arch specific variables
LOCAL_SRC_FILES_$(TARGET_ARCH):= LOCAL_SRC_FILES_$(TARGET_ARCH):=

2
core/host_executable.mk
View File

@ -2,6 +2,7 @@
my_prefix := HOST_ my_prefix := HOST_
include $(BUILD_SYSTEM)/multilib.mk include $(BUILD_SYSTEM)/multilib.mk
ifndef LOCAL_MODULE_HOST_ARCH
ifndef my_module_multilib ifndef my_module_multilib
ifeq ($(HOST_PREFER_32_BIT),true) ifeq ($(HOST_PREFER_32_BIT),true)
my_module_multilib := 32 my_module_multilib := 32
@ -10,6 +11,7 @@ else
my_module_multilib := first my_module_multilib := first
endif endif
endif endif
endif
ifeq ($(my_module_multilib),both) ifeq ($(my_module_multilib),both)
ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),) ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),)

2
core/host_shared_library.mk
View File

@ -1,6 +1,7 @@
my_prefix := HOST_ my_prefix := HOST_
include $(BUILD_SYSTEM)/multilib.mk include $(BUILD_SYSTEM)/multilib.mk
ifndef LOCAL_MODULE_HOST_ARCH
ifndef my_module_multilib ifndef my_module_multilib
ifeq ($(HOST_PREFER_32_BIT),true) ifeq ($(HOST_PREFER_32_BIT),true)
my_module_multilib := 32 my_module_multilib := 32
@ -9,6 +10,7 @@ else
my_module_multilib := first my_module_multilib := first
endif endif
endif endif
endif
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
include $(BUILD_SYSTEM)/module_arch_supported.mk include $(BUILD_SYSTEM)/module_arch_supported.mk

2
core/host_static_library.mk
View File

@ -1,6 +1,7 @@
my_prefix := HOST_ my_prefix := HOST_
include $(BUILD_SYSTEM)/multilib.mk include $(BUILD_SYSTEM)/multilib.mk
ifndef LOCAL_MODULE_HOST_ARCH
ifndef my_module_multilib ifndef my_module_multilib
ifeq ($(HOST_PREFER_32_BIT),true) ifeq ($(HOST_PREFER_32_BIT),true)
my_module_multilib := 32 my_module_multilib := 32
@ -9,6 +10,7 @@ else
my_module_multilib := first my_module_multilib := first
endif endif
endif endif
endif
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
include $(BUILD_SYSTEM)/module_arch_supported.mk include $(BUILD_SYSTEM)/module_arch_supported.mk