From 6feb6d5607ce86a446645564212043964628f540 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 17 Apr 2014 10:03:35 -0700 Subject: 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 --- core/static_library_internal.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'core/static_library_internal.mk') diff --git a/core/static_library_internal.mk b/core/static_library_internal.mk index 2d3468c..cabe823 100644 --- a/core/static_library_internal.mk +++ b/core/static_library_internal.mk @@ -28,7 +28,6 @@ $(all_objects) : PRIVATE_TARGET_GLOBAL_CFLAGS := $(all_objects) : PRIVATE_TARGET_GLOBAL_CPPFLAGS := endif -$(LOCAL_BUILT_MODULE): PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX) $(LOCAL_BUILT_MODULE) : $(built_whole_libraries) $(LOCAL_BUILT_MODULE) : $(all_objects) $(transform-o-to-static-lib) -- cgit v1.1