Make gyp target_arch setting native to chromium/config.py

scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.arm.32.json

 {
   "android_defaults": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja", 
       "default_targets": [
         "All"
       ]
     }, 
     "gyp_env": {
       "GYP_CROSSCOMPILE": "1", 
       "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
       "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }, 
   "blink": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
         "all_webkit"
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library", 
+      "GYP_DEFINES": "component=shared_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
   "blink_clang": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma-clang", 
       "default_targets": [
         "all_webkit"
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "clang=1 component=shared_library", 
+      "GYP_DEFINES": "clang=1 component=shared_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
   "chromium": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
         "All", 
         "chromium_builder_tests"
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library", 
+      "GYP_DEFINES": "component=shared_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
   "chromium_clang": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma-clang", 
       "default_targets": [
         "All", 
         "chromium_builder_tests"
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "clang=1 component=shared_library", 
+      "GYP_DEFINES": "clang=1 component=shared_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
   "clang_builder": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma-clang", 
       "default_targets": [
@@ skipping 107 matching lines @@
     }
   }, 
   "msvs": "can not use msvs on \"linux\"", 
   "ninja": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja"
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library", 
+      "GYP_DEFINES": "component=shared_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
   "tests_base": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]', 'out')", 
     "compile_py": {
       "build_tool": "ninja", 
       "default_targets": [
         "All"
@@ skipping 42 matching lines @@
   "v8": {
     "build_config_fs": "Debug", 
     "build_dir": "Path('[CHECKOUT]')", 
     "compile_py": {
       "build_tool": "make", 
       "default_targets": [
         "buildbot"
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "v8_target_arch=arm"
+      "GYP_DEFINES": "target_arch=arm v8_target_arch=arm"
     }
   }, 
-  "x86_builder": {
-    "build_config_fs": "Debug", 
-    "build_dir": "Path('[CHECKOUT]', 'out')", 
-    "compile_py": {
-      "build_tool": "ninja", 
-      "compiler": "goma", 
-      "default_targets": [
-        "All"
-      ]
-    }, 
-    "gyp_env": {
-      "GYP_CROSSCOMPILE": "1", 
-      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=ia32", 
-      "GYP_GENERATORS": "ninja", 
-      "GYP_GENERATOR_FLAGS": "default_target=All"
-    }
-  }, 
-  "x86_try_builder": {
-    "build_config_fs": "Debug", 
-    "build_dir": "Path('[CHECKOUT]', 'out')", 
-    "compile_py": {
-      "build_tool": "ninja", 
-      "compiler": "goma", 
-      "default_targets": [
-        "All"
-      ]
-    }, 
-    "gyp_env": {
-      "GYP_CROSSCOMPILE": "1", 
-      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=ia32", 
-      "GYP_GENERATORS": "ninja", 
-      "GYP_GENERATOR_FLAGS": "default_target=All"
-    }
-  }, 
-  "x86_try_instrumentation_tests": {
-    "build_config_fs": "Debug", 
-    "build_dir": "Path('[CHECKOUT]', 'out')", 
-    "compile_py": {
-      "build_tool": "ninja", 
-      "default_targets": [
-        "All"
-      ]
-    }, 
-    "gyp_env": {
-      "GYP_CROSSCOMPILE": "1", 
-      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm", 
-      "GYP_GENERATORS": "ninja", 
-      "GYP_GENERATOR_FLAGS": "default_target=All"
-    }
-  }, 
+  "x86_builder": "Cannot target x86 with TARGET_ARCH == arm", 
+  "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [Cannot target x86 with TARGET_ARCH == arm]", 
+  "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" includes \"x86_builder\", but [Cannot target x86 with TARGET_ARCH == arm]", 
   "xcodebuild": "can not use xcodebuild on \"linux\""
 }