diff options
| author | Ying Wang <wangying@google.com> | 2014-09-02 23:05:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-02 23:05:43 +0000 |
| commit | 0850330caa352ea2dc412df495c6ad95e4264d05 (patch) | |
| tree | 4e5149dd1353aa476843010cc15f4b3b2e1a17c7 | |
| parent | ec8778e89f872b9a12cc6b3367400ecd33cb32d0 (diff) | |
| parent | 7ba7d7f4f5936e46c2b35dc5f01ea7865e612dfb (diff) | |
| download | build-0850330caa352ea2dc412df495c6ad95e4264d05.tar.gz | |
Merge "Default host module to 64-bit except for SDK builds."
| -rw-r--r-- | core/envsetup.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index a57041ba31..efcad0de50 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -67,13 +67,6 @@ ifeq ($(HOST_OS),) $(error Unable to determine HOST_OS from uname -sm: $(UNAME)!) endif -# TODO: Replace BUILD_HOST_64bit with a flag that forces 32-bit build, -# after we default to 64-bit host build. -ifeq (,$(BUILD_HOST_64bit)) -# Default to 32-bit-by-default multilib host build. -HOST_PREFER_32_BIT := true -endif - # HOST_ARCH ifneq (,$(findstring x86_64,$(UNAME))) HOST_ARCH := x86_64 @@ -81,12 +74,6 @@ ifneq (,$(findstring x86_64,$(UNAME))) HOST_IS_64_BIT := true endif -ifeq ($(HOST_PREFER_32_BIT),true) -SDK_HOST_ARCH := x86 -else -SDK_HOST_ARCH := $(HOST_ARCH) -endif - BUILD_ARCH := $(HOST_ARCH) BUILD_2ND_ARCH := $(HOST_2ND_ARCH) @@ -133,6 +120,17 @@ $(warning bad TARGET_BUILD_VARIANT: $(TARGET_BUILD_VARIANT)) $(error must be empty or one of: eng user userdebug) endif +# Build host as 32-bit for SDK build. +ifneq ($(filter $(MAKECMDGOALS),win_sdk sdk),) +HOST_PREFER_32_BIT := true +endif +ifdef USE_MINGW +# We only build sdk host tools in the MinGW windows build. +# Build it as 32-bit as well. +HOST_PREFER_32_BIT := true +endif +SDK_HOST_ARCH := x86 + # Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE) # or under vendor/*/$(TARGET_DEVICE). Search in both places, but # make sure only one exists. |