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 5b2cb84d40bd8221df73aa6cc426c93dc4cf2ce2..3947333890a27a9dc8f1e0b19e9df420ffed0a7d 100644
--- a/scripts/slave/recipe_modules/chromium/config.py
+++ b/scripts/slave/recipe_modules/chromium/config.py
@@ -119,10 +119,18 @@ 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'

[navabi, 2013/11/08 19:01:15]

Was this needed for c.HOST_PLATFORM == win and c.TARGET_BITS == 64? If so it
looks like it is not set in the gyp_arch block below, and if not, what was it
doing here in the first place?

[iannucci, 2013/11/08 19:49:57]

It was just a temporary holdover until we did the proper implementation, since
we needed proper support for 64bit windows builds.

Most of the time build/common.gypi 'automatically' detects the proper value for
target_arch. The target_arch actually has nothing to do with HOST_PLATFORM, it
only has to do with TARGET_ARCH and TARGET_BITS.

     else:
       c.gyp_env.GYP_MSVS_VERSION = '2010'
 
+  gyp_arch = {
+    ('intel', 32) : 'ia32',
+    ('intel', 64) : 'x64',
+    ('arm', 32)   : 'arm',
+    ('mips', 32)  : 'mips',
+  }.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':