Revert of [android] Migrate more configs to gyp.

Makefile.android

 # 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 17 matching lines @@
 # Those definitions should be consistent with the main Makefile
 ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
                  android_mipsel android_x87
 MODES = release debug
 
 # Generates all combinations of ANDROID ARCHES and MODES,
 # e.g. "android_ia32.release" or "android_arm.release"
 ANDROID_BUILDS = $(foreach mode,$(MODES), \
                    $(addsuffix .$(mode),$(ANDROID_ARCHES)))
 
+HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
+
 ifeq ($(ARCH), android_arm)
-  DEFINES  = target_arch=arm v8_target_arch=arm
+  DEFINES  = target_arch=arm v8_target_arch=arm android_target_arch=arm android_target_platform=16
+  DEFINES += arm_neon=0 arm_version=7
 else ifeq ($(ARCH), android_arm64)
-  DEFINES  = target_arch=arm64 v8_target_arch=arm64
+  DEFINES  = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=21
 else ifeq ($(ARCH), android_mipsel)
-  DEFINES  = target_arch=mipsel v8_target_arch=mipsel
+  DEFINES  = target_arch=mipsel v8_target_arch=mipsel android_target_platform=16
+  DEFINES += android_target_arch=mips mips_arch_variant=mips32r2
 else ifeq ($(ARCH), android_ia32)
-  DEFINES = target_arch=ia32 v8_target_arch=ia32
+  DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android_target_platform=16
 else ifeq ($(ARCH), android_x64)
-  DEFINES = target_arch=x64 v8_target_arch=x64
+  DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64 android_target_platform=21
 else ifeq ($(ARCH), android_x87)
-  DEFINES = target_arch=ia32 v8_target_arch=x87
+  DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_target_platform=16
 else
   $(error Target architecture "${ARCH}" is not supported)
 endif
 
 # Common flags.
-DEFINES += OS=android
+DEFINES += host_os=${HOST_OS} OS=android
 
 .SECONDEXPANSION:
 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@
         @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \
                   BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
                               python -c "print raw_input().capitalize()") \
                   builddir="$(shell pwd)/$(OUTDIR)/$@"
 
 # Android GYP file generation targets.
 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS))
 $(ANDROID_MAKEFILES):
         GYP_GENERATORS=make-android \
         GYP_DEFINES="${DEFINES}" \
         PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH)" \
         build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
                       -Ibuild/standalone.gypi --depth=. \
                       -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS}