[android] Migrate more configs to gyp.

Makefile.android

Index: Makefile.android
diff --git a/Makefile.android b/Makefile.android
index a550d4253b01e1a430102fa8d2a21029ba6b884c..c2671b213f129e63eaed748cd1a0e2f88799d722 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -35,28 +35,26 @@ MODES = release debug
 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 android_target_arch=arm android_target_platform=16
+  DEFINES  = target_arch=arm v8_target_arch=arm
   DEFINES += arm_neon=0 arm_version=7
 else ifeq ($(ARCH), android_arm64)
-  DEFINES  = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=21
+  DEFINES  = target_arch=arm64 v8_target_arch=arm64
 else ifeq ($(ARCH), android_mipsel)
-  DEFINES  = target_arch=mipsel v8_target_arch=mipsel android_target_platform=16
-  DEFINES += android_target_arch=mips mips_arch_variant=mips32r2

[Michael Achenbach, 2015/06/24 14:53:31]

I'd like to tidy up mips_arch_variant=mips32r2. Is this working as intended?

In chromium's common.gypi, the variants are called r1 and r2. There's a cflag
-mips32r2 but no such variant. Does this have an effect at all? Or should it be
changed to  mips_arch_variant=r2?

[dusmil.imgtec, 2015/06/24 15:55:20]

Yes, this should follow chromium variants and variants from standalone.gypi.
So the correct values are r1, r2, r6. Default value for standalone d8 shell
build for android should be r2.

[dusmil.imgtec, 2015/06/24 16:08:23]

On 2015/06/24 14:53:31, Michael Achenbach wrote:
I see now this is not a gyp variable and most likely it does not have any
effect.

[Michael Achenbach, 2015/06/26 08:46:58]

I'll delete mips_arch_variant as it has no effect. A further code-smell is that
in our standalon.gypi, the mips_arch_variant is set to r2 by default, but then
there is no code that reads the variable at all. In chromium's common.gypi,
several cflags are set/unset based on the variant version.

+  DEFINES  = target_arch=mipsel v8_target_arch=mipsel
+  DEFINES += mips_arch_variant=mips32r2
 else ifeq ($(ARCH), android_ia32)
-  DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android_target_platform=16
+  DEFINES = target_arch=ia32 v8_target_arch=ia32
 else ifeq ($(ARCH), android_x64)
-  DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64 android_target_platform=21
+  DEFINES = target_arch=x64 v8_target_arch=x64
 else ifeq ($(ARCH), android_x87)
-  DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_target_platform=16

[Michael Achenbach, 2015/06/24 14:53:31]

Target arch x87 seems like a mistake to me. CC'ing somebody from intel.

+  DEFINES = target_arch=ia32 v8_target_arch=x87
 else
   $(error Target architecture "${ARCH}" is not supported)
 endif
 
 # Common flags.
-DEFINES += host_os=${HOST_OS} OS=android
+DEFINES += OS=android
 
 .SECONDEXPANSION:
 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@