am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build."

* commit 'ede3e3103565175fc15b76cd6f9daf7e2b93393b':
  Build 64-bit host tools in Linux/Mac SDK build.
This commit is contained in:
Ying Wang
2015-08-03 18:02:04 +00:00
committed by Android Git Automerger

View File

@@ -136,10 +136,6 @@ $(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.