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/prebuilt.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/prebuilt.mk')
| -rw-r--r-- | core/prebuilt.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/prebuilt.mk b/core/prebuilt.mk index 5f91110..c280900 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -7,8 +7,10 @@ ########################################################### ifdef LOCAL_IS_HOST_MODULE -include $(BUILD_SYSTEM)/prebuilt_internal.mk -else #!LOCAL_IS_HOST_MODULE + my_prefix := HOST_ +else + my_prefix := TARGET_ +endif include $(BUILD_SYSTEM)/multilib.mk @@ -23,16 +25,15 @@ include $(BUILD_SYSTEM)/module_arch_supported.mk ifeq ($(my_module_arch_supported),true) # first arch is supported include $(BUILD_SYSTEM)/prebuilt_internal.mk -else ifneq (,$(TARGET_2ND_ARCH)) +else ifneq (,$($(my_prefix)2ND_ARCH)) # check if secondary arch is supported -LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) +LOCAL_2ND_ARCH_VAR_PREFIX := $($(my_prefix)2ND_ARCH_VAR_PREFIX) include $(BUILD_SYSTEM)/module_arch_supported.mk ifeq ($(my_module_arch_supported),true) # secondary arch is supported include $(BUILD_SYSTEM)/prebuilt_internal.mk endif -endif # TARGET_2ND_ARCH -endif # !LOCAL_IS_HOST_MODULE +endif # $(my_prefix)2ND_ARCH LOCAL_2ND_ARCH_VAR_PREFIX := |