aboutsummaryrefslogtreecommitdiffstats
path: root/tools/acp
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-04-17 10:03:35 -0700
committerYing Wang <wangying@google.com>2014-05-14 16:55:04 -0700
commit6feb6d5607ce86a446645564212043964628f540 (patch)
tree082c2e4dfdcbfe7ff90dcee210b0de488cb54610 /tools/acp
parentda492d7ed029b721bef02ca02d98148d5d9f4b3d (diff)
downloadplatform_build-6feb6d5607ce86a446645564212043964628f540.tar.gz
platform_build-6feb6d5607ce86a446645564212043964628f540.tar.bz2
platform_build-6feb6d5607ce86a446645564212043964628f540.zip
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 'tools/acp')
-rw-r--r--tools/acp/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/acp/Android.mk b/tools/acp/Android.mk
index 5e0e2e461e..33c55675f1 100644
--- a/tools/acp/Android.mk
+++ b/tools/acp/Android.mk
@@ -6,7 +6,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- acp.c
+ acp.c
ifeq ($(HOST_OS),cygwin)
LOCAL_CFLAGS += -DWIN32_EXE
@@ -23,4 +23,3 @@ LOCAL_MODULE := acp
LOCAL_ACP_UNAVAILABLE := true
include $(BUILD_HOST_EXECUTABLE)
-