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/host_shared_library.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/host_shared_library.mk')
-rw-r--r-- | core/host_shared_library.mk | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index 56ced01..de5e6ad 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -1,49 +1,37 @@ -########################################################### -## Standard rules for building a normal shared library. -## -## Additional inputs from base_rules.make: -## None. -## -## LOCAL_MODULE_SUFFIX will be set for you. -########################################################### - -LOCAL_IS_HOST_MODULE := true +my_prefix := HOST_ +include $(BUILD_SYSTEM)/multilib.mk -ifeq ($(strip $(LOCAL_MODULE_CLASS)),) -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -endif -ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),) -LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX) -endif -ifneq ($(strip $(OVERRIDE_BUILT_MODULE_PATH)),) -$(error $(LOCAL_PATH): Illegal use of OVERRIDE_BUILT_MODULE_PATH) -endif -ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),) -$(error $(LOCAL_PATH): Cannot set module stem for a library) +ifndef my_module_multilib +# By default we only build host module for the first arch. +my_module_multilib := first endif -$(call host-shared-library-hook) +LOCAL_2ND_ARCH_VAR_PREFIX := +include $(BUILD_SYSTEM)/module_arch_supported.mk -skip_build_from_source := -ifdef LOCAL_PREBUILT_MODULE_FILE -ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) -include $(BUILD_SYSTEM)/prebuilt_internal.mk -skip_build_from_source := true +ifeq ($(my_module_arch_supported),true) +include $(BUILD_SYSTEM)/host_shared_library_internal.mk endif -endif - -ifndef skip_build_from_source - -# Put the built modules of all shared libraries in a common directory -# to simplify the link line. -OVERRIDE_BUILT_MODULE_PATH := $(HOST_OUT_INTERMEDIATE_LIBRARIES) -include $(BUILD_SYSTEM)/binary.mk - -$(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) $(LOCAL_ADDITIONAL_DEPENDENCIES) - $(transform-host-o-to-shared-lib) +ifdef HOST_2ND_ARCH +LOCAL_2ND_ARCH_VAR_PREFIX := $(HOST_2ND_ARCH_VAR_PREFIX) +include $(BUILD_SYSTEM)/module_arch_supported.mk +ifeq ($(my_module_arch_supported),true) +# Build for HOST_2ND_ARCH +OVERRIDE_BUILT_MODULE_PATH := +LOCAL_BUILT_MODULE := +LOCAL_INSTALLED_MODULE := +LOCAL_MODULE_STEM := +LOCAL_BUILT_MODULE_STEM := +LOCAL_INSTALLED_MODULE_STEM := +LOCAL_INTERMEDIATE_TARGETS := + +include $(BUILD_SYSTEM)/host_shared_library_internal.mk +endif +LOCAL_2ND_ARCH_VAR_PREFIX := +endif # HOST_2ND_ARCH -endif # skip_build_from_source +my_module_arch_supported := ########################################################### ## Copy headers to the install tree |