Add Android cross-compilation support for x86

Makefile

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 16 matching lines @@
 
 
 # Variable default definitions. Override them by exporting them in your shell.
 CXX ?= g++
 LINK ?= g++
 OUTDIR ?= out
 TESTJOBS ?= -j16
 GYPFLAGS ?=
 TESTFLAGS ?=
 ANDROID_NDK_ROOT ?=
-ANDROID_TOOL_PREFIX = $(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi
 
 # Special build flags. Use them like this: "make library=shared"
 
 # library=shared || component=shared_library
 ifeq ($(library), shared)
   GYPFLAGS += -Dcomponent=shared_library
 endif
 ifdef component
   GYPFLAGS += -Dcomponent=$(component)
 endif
@@ skipping 48 matching lines @@
   GYPFLAGS += -Dv8_no_strict_aliasing=1
 endif
 
 # ----------------- available targets: --------------------
 # - "dependencies": pulls in external dependencies (currently: GYP)
 # - any arch listed in ARCHES (see below)
 # - any mode listed in MODES
 # - every combination <arch>.<mode>, e.g. "ia32.release"
 # - "native": current host's architecture, release mode
 # - any of the above with .check appended, e.g. "ia32.release.check"
-# - "android": cross-compile for Android/ARM (release mode)
+# - "android-arm": cross-compile for Android/ARM (release mode)
+# - "android-ia32": cross-compile for Android/IA32 (release mode)
 # - default (no target specified): build all DEFAULT_ARCHES and MODES
 # - "check": build all targets and run all tests
 # - "<arch>.clean" for any <arch> in ARCHES
 # - "clean": clean all ARCHES
 
 # ----------------- internal stuff ------------------------
 
 # Architectures and modes to be compiled. Consider these to be internal
 # variables, don't override them (use the targets instead).
 ARCHES = ia32 x64 arm mips
@@ skipping 33 matching lines @@
                  BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
                              python -c "print raw_input().capitalize()") \
                  builddir="$(shell pwd)/$(OUTDIR)/$@"
 
 native: $(OUTDIR)/Makefile.native
         @$(MAKE) -C "$(OUTDIR)" -f Makefile.native \
                  CXX="$(CXX)" LINK="$(LINK)" BUILDTYPE=Release \
                  builddir="$(shell pwd)/$(OUTDIR)/$@"
 
 # TODO(jkummerow): add "android.debug" when we need it.
-android android.release: $(OUTDIR)/Makefile.android
-        @$(MAKE) -C "$(OUTDIR)" -f Makefile.android \
-                CXX="$(ANDROID_TOOL_PREFIX)-g++" \
-                AR="$(ANDROID_TOOL_PREFIX)-ar" \
-                RANLIB="$(ANDROID_TOOL_PREFIX)-ranlib" \
-                CC="$(ANDROID_TOOL_PREFIX)-gcc" \
-                LD="$(ANDROID_TOOL_PREFIX)-ld" \
-                LINK="$(ANDROID_TOOL_PREFIX)-g++" \
-                BUILDTYPE=Release \
-                builddir="$(shell pwd)/$(OUTDIR)/android.release"
+android-arm.release: $(OUTDIR)/Makefile-android-arm
+        @$(MAKE) -C "$(OUTDIR)" -f Makefile-android-arm \
+                CXX="$(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi-g++" \
+                AR="$(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi-ar" \
+                RANLIB="$(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi-ranlib" \
+                CC="$(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi-gcc" \
+                LD="$(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi-ld" \
+                LINK="$(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi-g++" \
+                BUILDTYPE=Release \
+                builddir="$(shell pwd)/$(OUTDIR)/android-arm.release"
+
+android-ia32.release: $(OUTDIR)/Makefile-android-ia32
+        @$(MAKE) -C "$(OUTDIR)" -f Makefile-android-ia32 \
+                CXX="$(ANDROID_NDK_ROOT)/toolchain/bin/i686-android-linux-g++" \
+                AR="$(ANDROID_NDK_ROOT)/toolchain/bin/i686-android-linux-ar" \
+                RANLIB="$(ANDROID_NDK_ROOT)/toolchain/bin/i686-android-linux-ranlib" \
+                CC="$(ANDROID_NDK_ROOT)/toolchain/bin/i686-android-linux-gcc" \
+                LD="$(ANDROID_NDK_ROOT)/toolchain/bin/i686-android-linux-ld" \
+                LINK="$(ANDROID_NDK_ROOT)/toolchain/bin/i686-android-linux-g++" \
+                BUILDTYPE=Release \
+                builddir="$(shell pwd)/$(OUTDIR)/android-ia32.release"
 
 # Test targets.
 check: all
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch=$(shell echo $(DEFAULT_ARCHES) | sed -e 's/ /,/g') \
             $(TESTFLAGS)
 
 $(addsuffix .check,$(MODES)): $$(basename $$@)
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --mode=$(basename $@) $(TESTFLAGS)
 
 $(addsuffix .check,$(ARCHES)): $$(basename $$@)
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch=$(basename $@) $(TESTFLAGS)
 
 $(CHECKS): $$(basename $$@)
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch-and-mode=$(basename $@) $(TESTFLAGS)
 
 native.check: native
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)/native \
             --arch-and-mode=. $(TESTFLAGS)
 
 # Clean targets. You can clean each architecture individually, or everything.
-$(addsuffix .clean,$(ARCHES)) android.clean:
+$(addsuffix .clean,$(ARCHES)):
         rm -f $(OUTDIR)/Makefile.$(basename $@)
         rm -rf $(OUTDIR)/$(basename $@).release
         rm -rf $(OUTDIR)/$(basename $@).debug
         find $(OUTDIR) -regex '.*\(host\|target\).$(basename $@)\.mk' -delete
 
 native.clean:
         rm -f $(OUTDIR)/Makefile.native
         rm -rf $(OUTDIR)/native
         find $(OUTDIR) -regex '.*\(host\|target\).native\.mk' -delete
 
-clean: $(addsuffix .clean,$(ARCHES)) native.clean android.clean
+android-arm.clean:
+        rm -f $(OUTDIR)/Makefile-android-arm
+        rm -rf $(OUTDIR)/android-arm.release
+        find $(OUTDIR) -regex '.*\(host\|target\)-android-arm\.mk' -delete
+
+android-ia32.clean:
+        rm -f $(OUTDIR)/Makefile-android-ia32
+        rm -rf $(OUTDIR)/android-ia32.release
+        find $(OUTDIR) -regex '.*\(host\|target\)-android-ia32\.mk' -delete
+
+clean: $(addsuffix .clean,$(ARCHES)) native.clean android-arm.clean android-ia32.clean
 
 # GYP file generation targets.
 MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES))
 $(MAKEFILES): $(GYPFILES) $(ENVFILE)
         GYP_GENERATORS=make \
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
                       -Ibuild/standalone.gypi --depth=. \
                       -Dv8_target_arch=$(subst .,,$(suffix $@)) \
                       -S.$(subst .,,$(suffix $@)) $(GYPFLAGS)
 
 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
         GYP_GENERATORS=make \
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
                       -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
 
-$(OUTDIR)/Makefile.android: $(GYPFILES) $(ENVFILE) build/android.gypi \
+$(OUTDIR)/Makefile-android-arm: $(GYPFILES) $(ENVFILE) build/android-arm.gypi \
                             must-set-ANDROID_NDK_ROOT
         GYP_GENERATORS=make \
-        CC="${ANDROID_TOOL_PREFIX}-gcc" \
+        CC="$(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi-gcc" \
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-                      -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
-                      -S.android $(GYPFLAGS)
+                -Ibuild/standalone.gypi --depth=. -Ibuild/android-arm.gypi \
+                -S-android-arm $(GYPFLAGS)
+
+$(OUTDIR)/Makefile-android-ia32: $(GYPFILES) $(ENVFILE) build/android-ia32.gypi \
+                            must-set-ANDROID_NDK_ROOT
+        GYP_GENERATORS=make \
+        CC="$(ANDROID_NDK_ROOT)/toolchain/bin/i686-android-linux-gcc" \
+        build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
+                -Ibuild/standalone.gypi --depth=. -Ibuild/android-ia32.gypi \
+                -S-android-ia32 $(GYPFLAGS)
 
 must-set-ANDROID_NDK_ROOT:
 ifndef ANDROID_NDK_ROOT
           $(error ANDROID_NDK_ROOT is not set)
 endif
 
 # Replaces the old with the new environment file if they're different, which
 # will trigger GYP to regenerate Makefiles.
 $(ENVFILE): $(ENVFILE).new
         @if test -r $(ENVFILE) && cmp $(ENVFILE).new $(ENVFILE) >/dev/null; \
             then rm $(ENVFILE).new; \
             else mv $(ENVFILE).new $(ENVFILE); fi
 
 # Stores current GYPFLAGS in a file.
 $(ENVFILE).new:
         @mkdir -p $(OUTDIR); echo "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new; \
             echo "CXX=$(CXX)" >> $(ENVFILE).new
 
 # Dependencies.
 dependencies:
         svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
             --revision 1282