Make gyp target_arch setting native to chromium/config.py

scripts/slave/recipe_modules/chromium/config.py

Index: scripts/slave/recipe_modules/chromium/config.py
diff --git a/scripts/slave/recipe_modules/chromium/config.py b/scripts/slave/recipe_modules/chromium/config.py
index 8fdbf2dd5a8dc7a06a4e4d0691136f18c6043ef1..7e570db374fadc38461abcddfbe6fb608327b799 100644
--- a/scripts/slave/recipe_modules/chromium/config.py
+++ b/scripts/slave/recipe_modules/chromium/config.py
@@ -119,10 +119,20 @@ def BASE(c):
       # Windows requires 64-bit builds to be in <dir>_x64.
       c.build_config_fs = c.BUILD_CONFIG + '_x64'
       c.gyp_env.GYP_MSVS_VERSION = '2012'
-      c.gyp_env.GYP_DEFINES['target_arch'] = 'x64'
     else:
       c.gyp_env.GYP_MSVS_VERSION = '2010'
 
+  gyp_arch = {
+    ('intel', 32): 'ia32',
+    ('intel', 64): 'x64',
+    ('arm',   32): 'arm',
+    ('arm',   64): 'arm',
+    ('mips',  32): 'mips',

[Nico, 2014/02/19 02:53:31]

This should be "mipsel", not "mips", right?

+    ('mips',  64): 'mips',

[Nico, 2014/02/19 02:53:31]

(and this shouldn't do anything yet as it's currently not used – but "mips" is
fairly likely not what we want here once it's going to be used.)

+  }.get((c.TARGET_ARCH, c.TARGET_BITS))
+  if gyp_arch:
+    c.gyp_env.GYP_DEFINES['target_arch'] = gyp_arch
+
   if c.BUILD_CONFIG == 'Release':
     static_library(c, final=False)
   elif c.BUILD_CONFIG == 'Debug':