diff options
| author | Ying Wang <wangying@google.com> | 2014-09-02 23:28:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-02 23:28:51 +0000 |
| commit | 38074e8eb0b7fdbb76ddfc1da0dc756424c4ecae (patch) | |
| tree | e2b376e5ebe84d27e751b3184f71c0ab898de577 /core/envsetup.mk | |
| parent | 6aa90f75f60d788a2c631968ead557c8a46b90a1 (diff) | |
| parent | 80ff45ba98922b56ca70cc39fdb530482d366684 (diff) | |
| download | build-38074e8eb0b7fdbb76ddfc1da0dc756424c4ecae.zip build-38074e8eb0b7fdbb76ddfc1da0dc756424c4ecae.tar.gz build-38074e8eb0b7fdbb76ddfc1da0dc756424c4ecae.tar.bz2 | |
am 80ff45ba: am 0850330c: Merge "Default host module to 64-bit except for SDK builds."
* commit '80ff45ba98922b56ca70cc39fdb530482d366684':
Default host module to 64-bit except for SDK builds.
Diffstat (limited to 'core/envsetup.mk')
| -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 ce9d34e..cfc9650 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) @@ -143,6 +130,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. |