diff options
| author | Ying Wang <wangying@google.com> | 2014-04-17 10:03:35 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-14 16:55:04 -0700 |
| commit | 6feb6d5607ce86a446645564212043964628f540 (patch) | |
| tree | 082c2e4dfdcbfe7ff90dcee210b0de488cb54610 /core/module_arch_supported.mk | |
| parent | da492d7ed029b721bef02ca02d98148d5d9f4b3d (diff) | |
| download | build-6feb6d5607ce86a446645564212043964628f540.zip build-6feb6d5607ce86a446645564212043964628f540.tar.gz build-6feb6d5607ce86a446645564212043964628f540.tar.bz2 | |
Support host multilib build
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.
In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.
To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.
Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
Diffstat (limited to 'core/module_arch_supported.mk')
| -rw-r--r-- | core/module_arch_supported.mk | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/core/module_arch_supported.mk b/core/module_arch_supported.mk index 753a29e..15fd648 100644 --- a/core/module_arch_supported.mk +++ b/core/module_arch_supported.mk @@ -2,14 +2,15 @@ ## Determine if a module can be built for an arch ## ## Inputs from module makefile: +## my_prefix TARGET_ or HOST_ ## my_module_multilib -## LOCAL_MODULE_TARGET_ARCH -## LOCAL_MODULE_TARGET_ARCH_WARN -## LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH -## LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN +## LOCAL_MODULE_$(my_prefix)ARCH +## LOCAL_MODULE_$(my_prefix)ARCH_WARN +## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH +## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH_WARN ## ## Inputs from build system: -## TARGET_IS_64_BIT +## $(my_prefix)IS_64_BIT ## LOCAL_2ND_ARCH_VAR_PREFIX ## ## Outputs: @@ -23,9 +24,9 @@ my_module_arch_supported := false endif ifeq ($(LOCAL_2ND_ARCH_VAR_PREFIX),) -ifeq ($(TARGET_IS_64_BIT)|$(my_module_multilib),true|32) +ifeq ($($(my_prefix)IS_64_BIT)|$(my_module_multilib),true|32) my_module_arch_supported := false -else ifeq ($(TARGET_IS_64_BIT)|$(my_module_multilib),|64) +else ifeq ($($(my_prefix)IS_64_BIT)|$(my_module_multilib),|64) my_module_arch_supported := false else ifeq ($(call directory_is_64_bit_blacklisted,$(LOCAL_PATH)),true) my_module_arch_supported := false @@ -38,24 +39,24 @@ my_module_arch_supported := false endif endif # LOCAL_2ND_ARCH_VAR_PREFIX -ifneq (,$(LOCAL_MODULE_TARGET_ARCH)) -ifeq (,$(filter $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_TARGET_ARCH))) +ifneq (,$(LOCAL_MODULE_$(my_prefix)ARCH)) +ifeq (,$(filter $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_$(my_prefix)ARCH))) my_module_arch_supported := false endif endif -ifneq (,$(LOCAL_MODULE_TARGET_ARCH_WARN)) -ifeq (,$(filter $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_TARGET_ARCH_WARN))) +ifneq (,$(LOCAL_MODULE_$(my_prefix)ARCH_WARN)) +ifeq (,$(filter $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_$(my_prefix)ARCH_WARN))) my_module_arch_supported := false -$(warning $(LOCAL_MODULE): architecture $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) not supported) +$(warning $(LOCAL_MODULE): architecture $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) not supported) endif endif -ifneq (,$(filter $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH))) +ifneq (,$(filter $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH))) my_module_arch_supported := false endif -ifneq (,$(filter $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN))) +ifneq (,$(filter $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH_WARN))) my_module_arch_supported := false -$(warning $(LOCAL_MODULE): architecture $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) unsupported) +$(warning $(LOCAL_MODULE): architecture $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) unsupported) endif |