Revert of Reland [android] Migrate more configs to gyp.

build/standalone.gypi

 # 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 204 matching lines @@
           'variables': {
             # The Android toolchain needs to use the absolute path to the NDK
             # because it is used at different levels in the GYP files.
             'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
             'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')",
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
           },
 
           # Copy conditionally-set variables out one scope.
           'android_ndk_root%': '<(android_ndk_root)',
-          'host_os%': '<(host_os)',
 
           'conditions': [
             ['target_arch == "ia32"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'x86',
-              'android_target_platform%': '16',
             }],
             ['target_arch == "x64"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'x86_64',
-              'android_target_platform%': '21',
             }],
             ['target_arch=="arm"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'arm',
-              'android_target_platform%': '16',
-              'arm_version%': 7,
             }],
             ['target_arch == "arm64"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'arm64',
-              'android_target_platform%': '21',
-              'arm_version%': 'default',
             }],
             ['target_arch == "mipsel"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'mips',
-              'android_target_platform%': '16',
             }],
             ['target_arch == "mips64el"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'mips64',
-              'android_target_platform%': '21',
             }],
           ],
         },
 
         # Copy conditionally-set variables out one scope.
-        'android_target_arch%': '<(android_target_arch)',
-        'android_target_platform%': '<(android_target_platform)',
         'android_toolchain%': '<(android_toolchain)',
-        'arm_version%': '<(arm_version)',
-        'host_os%': '<(host_os)',
 
         'conditions': [
           ['android_ndk_root==""', {
             'variables': {
               'android_sysroot': '<(android_toolchain)/sysroot/',
               'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/',
             },
             'android_include': '<(android_sysroot)/usr/include',
             'conditions': [
               ['target_arch=="x64"', {
@@ skipping 25 matching lines @@
       }],  # OS=="android"
       ['host_clang==1', {
         'host_cc': '../<(clang_dir)/bin/clang',
         'host_cxx': '../<(clang_dir)/bin/clang++',
       }, {
         'host_cc': '<!(which gcc)',
         'host_cxx': '<!(which g++)',
       }],
     ],
     # Default ARM variable settings.
+    'arm_version%': 'default',
     'arm_fpu%': 'vfpv3',
     'arm_float_abi%': 'default',
     'arm_thumb': 'default',
 
     # Default MIPS variable settings.
     'mips_arch_variant%': 'r2',
     # Possible values fp32, fp64, fpxx.
     # fp32 - 32 32-bit FPU registers are available, doubles are placed in
     #        register pairs.
     # fp64 - 32 64-bit FPU registers are available.
     # fpxx - compatibility mode, it chooses fp32 or fp64 depending on runtime
     #        detection
     'mips_fpu_mode%': 'fp32',
   },
   'target_defaults': {
     'variables': {
       'v8_code%': '<(v8_code)',
-      'conditions':[
-        ['OS=="android"', {
-          'host_os%': '<(host_os)',
-        }],
-      ],
     },
     'default_configuration': 'Debug',
     'configurations': {
       'DebugBaseCommon': {
         'conditions': [
           ['OS=="aix"', {
             'cflags': [ '-g', '-Og', '-gxcoff' ],
           }, {
             'cflags': [ '-g', '-O0' ],
           }],
@@ skipping 692 matching lines @@
     ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
       'make_global_settings': [
        ['CC_wrapper', '<(gomadir)/gomacc'],
        ['CXX_wrapper', '<(gomadir)/gomacc'],
        ['CC.host_wrapper', '<(gomadir)/gomacc'],
        ['CXX.host_wrapper', '<(gomadir)/gomacc'],
       ],
     }],
   ],
 }