Make gyp target_arch setting native to chromium/config.py

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

Index: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json
diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json
index 3d8b1ae13d836b1e03058ecf0f064ccfb391a052..75abbcf44eeea4a6ba90dbaa604749f21c6809ac 100644
--- a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json
+++ b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json
@@ -26,7 +26,7 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=static_library use_ash=0 use_aura=0", 
+      "GYP_DEFINES": "component=static_library target_arch=arm use_ash=0 use_aura=0", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
@@ -41,7 +41,7 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "clang=1 component=static_library use_ash=0 use_aura=0", 
+      "GYP_DEFINES": "clang=1 component=static_library target_arch=arm use_ash=0 use_aura=0", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
@@ -57,7 +57,7 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=static_library", 
+      "GYP_DEFINES": "component=static_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
@@ -73,7 +73,7 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "clang=1 component=static_library", 
+      "GYP_DEFINES": "clang=1 component=static_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
@@ -201,7 +201,7 @@
       "build_tool": "ninja"
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=static_library", 
+      "GYP_DEFINES": "component=static_library target_arch=arm", 
       "GYP_GENERATORS": "ninja"
     }
   }, 
@@ -264,58 +264,11 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "v8_target_arch=arm"
-    }
-  }, 
-  "x86_builder": {
-    "build_config_fs": "Release", 
-    "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": "Release", 
-    "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": "Release", 
-    "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"
+      "GYP_DEFINES": "target_arch=arm v8_target_arch=arm"
     }
   }, 
+  "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\""
 }