Enable building for android on x86_64 machines.

R=ulan@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/18535011

Patch from Ross McIlroy <rmcilroy@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15702 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

Makefile

@@ -34,6 +34,7 @@ TESTJOBS ?=
 GYPFLAGS ?=
 TESTFLAGS ?=
 ANDROID_NDK_ROOT ?=
+ANDROID_NDK_HOST_ARCH ?=
 ANDROID_TOOLCHAIN ?=
 ANDROID_V8 ?= /data/local/tmp/v8
 NACL_SDK_ROOT ?=

Makefile.android

@@ -35,11 +35,12 @@ ANDROID_BUILDS = $(foreach mode,$(MODES), \
                    $(addsuffix .$(mode),$(ANDROID_ARCHES)))
 
 HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
+ANDROID_NDK_HOST_ARCH ?= $(shell uname -m | sed -e 's/i[3456]86/x86/')
 ifeq ($(HOST_OS), linux)
-  TOOLCHAIN_DIR = linux-x86
+  TOOLCHAIN_DIR = linux-$(ANDROID_NDK_HOST_ARCH)
 else
   ifeq ($(HOST_OS), mac)
-    TOOLCHAIN_DIR = darwin-x86
+    TOOLCHAIN_DIR = darwin-$(ANDROID_NDK_HOST_ARCH)
   else
     $(error Host platform "${HOST_OS}" is not supported)
   endif
@@ -67,7 +68,9 @@ endif
 TOOLCHAIN_PATH = ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}/prebuilt
 ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR}
 ifeq ($(wildcard $(ANDROID_TOOLCHAIN)),)
-  $(error Cannot find Android toolchain in "${ANDROID_TOOLCHAIN}")
+  $(error Cannot find Android toolchain in "${ANDROID_TOOLCHAIN}".  Please \
+          check that ANDROID_NDK_ROOT and ANDROID_NDK_HOST_ARCH are set    \
+          correctly)
 endif
 
 # For mksnapshot host generation.