Make gyp target_arch setting native to chromium/config.py

scripts/slave/recipe_modules/chromium/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from slave import recipe_api
 
 class ChromiumApi(recipe_api.RecipeApi):
   def get_config_defaults(self):
     return {
       'HOST_PLATFORM': self.m.platform.name,
       'HOST_ARCH': self.m.platform.arch,
       'HOST_BITS': self.m.platform.bits,
 
       'TARGET_PLATFORM': self.m.platform.name,
       'TARGET_ARCH': self.m.platform.arch,
 
-      # This should probably default to the platform.bits, but right now this
-      # is the more expected configuration.
-      'TARGET_BITS': 32,
+      # NOTE: This is replicating logic which lives in
+      # chrome/trunk/src/build/common.gypi, which is undesirable. The desired
+      # end-state is that all the configuration logic lives in one place
+      # (in chromium/config.py), and the buildside gypfiles are as dumb as
+      # possible. However, since the recipes need to accurately contain
+      # {TARGET,HOST}_{BITS,ARCH,PLATFORM}, for use across many tools (of which
+      # gyp is one tool), we're taking a small risk and replicating the logic
+      # here.
+      'TARGET_BITS': (
+        32 if self.m.platform.name in ('mac', 'win')
+        else self.m.platform.bits),
 
       'BUILD_CONFIG': self.m.properties.get('build_config', 'Release')
     }
 
   def compile(self, targets=None, name=None, abort_on_failure=True, **kwargs):
     """Return a compile.py invocation."""
     targets = targets or self.c.compile_py.default_targets.as_jsonish()
     assert isinstance(targets, (list, tuple))
 
     args = [
@@ skipping 116 matching lines @@
         spawn_dbus=spawn_dbus,
         env=env)
 
   def runhooks(self, **kwargs):
     """Run the build-configuration hooks for chromium."""
     env = kwargs.get('env', {})
     env.update(self.c.gyp_env.as_jsonish())
     kwargs['env'] = env
     return self.m.gclient.runhooks(**kwargs)