OSDN Git Service

Support host multilib build
authorYing Wang <wangying@google.com>
Thu, 17 Apr 2014 17:03:35 +0000 (10:03 -0700)
committerYing Wang <wangying@google.com>
Wed, 14 May 2014 23:55:04 +0000 (16:55 -0700)
commit6feb6d5607ce86a446645564212043964628f540
tree082c2e4dfdcbfe7ff90dcee210b0de488cb54610
parentda492d7ed029b721bef02ca02d98148d5d9f4b3d
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
38 files changed:
core/base_rules.mk
core/binary.mk
core/clang/HOST_x86.mk
core/clang/HOST_x86_64.mk
core/clang/HOST_x86_common.mk [new file with mode: 0644]
core/clang/config.mk
core/clear_vars.mk
core/combo/HOST_darwin-x86.mk
core/combo/HOST_darwin-x86_64.mk [new file with mode: 0644]
core/combo/HOST_linux-x86.mk
core/combo/HOST_linux-x86_64.mk [new file with mode: 0644]
core/combo/HOST_windows-x86.mk
core/combo/HOST_windows-x86_64.mk [new file with mode: 0644]
core/combo/mac_version.mk [new file with mode: 0644]
core/combo/select.mk
core/config.mk
core/configure_module_stem.mk
core/definitions.mk
core/dynamic_binary.mk
core/envsetup.mk
core/executable.mk
core/host_executable.mk
core/host_executable_internal.mk [new file with mode: 0644]
core/host_shared_library.mk
core/host_shared_library_internal.mk [new file with mode: 0644]
core/host_static_library.mk
core/host_static_library_internal.mk [new file with mode: 0644]
core/main.mk
core/module_arch_supported.mk
core/package.mk
core/prebuilt.mk
core/prebuilt_internal.mk
core/product_config.mk
core/shared_library.mk
core/static_library.mk
core/static_library_internal.mk
libs/host/Android.mk
tools/acp/Android.mk