diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 19:26:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 19:26:30 +0000 |
| commit | f7988507f48576d1455696693281b63d8ba7f478 (patch) | |
| tree | 44272e70b3889a2381b30ac976d0d081301cdf74 /core/envsetup.mk | |
| parent | 80d3bd158270d53c2bfbb45c53160d2e89e87e1d (diff) | |
| parent | 2d19cbd279ed69c7202f089be174c35c1585f709 (diff) | |
| download | build-f7988507f48576d1455696693281b63d8ba7f478.zip build-f7988507f48576d1455696693281b63d8ba7f478.tar.gz build-f7988507f48576d1455696693281b63d8ba7f478.tar.bz2 | |
am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
Switch to 32-bit-by-default host multilib build.
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 3498e34..9e4e47e 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -67,28 +67,32 @@ 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 ifeq ($(HOST_PREFER_32_BIT),true) -# User asks for multilib build, but use 32-bit as preferred arch. BUILD_HOST_64bit := true endif +endif # HOST_ARCH ifneq (,$(findstring x86_64,$(UNAME))) - # 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)) - HOST_ARCH := x86 - HOST_2ND_ARCH := - else - HOST_ARCH := x86_64 - HOST_2ND_ARCH := x86 - endif + HOST_ARCH := x86_64 + HOST_2ND_ARCH := x86 else ifneq (,$(findstring 86,$(UNAME))) # It's not officially supported! HOST_ARCH := x86 HOST_2ND_ARCH := 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) |