Make gyp target_arch setting native to chromium/config.py

scripts/slave/recipe_modules/chromium/config.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.recipe_config import config_item_context, ConfigGroup
 from slave.recipe_config import Dict, Single, Static, Set, BadConf
 from slave.recipe_config_types import Path
 
 # Because of the way that we use decorators, pylint can't figure out the proper
 # type signature of functions annotated with the @config_ctx decorator.
@@ skipping 101 matching lines @@
 
   if c.HOST_BITS < c.TARGET_BITS:
     raise BadConf('host bits < targ bits')
 
   c.build_config_fs = c.BUILD_CONFIG
   if c.HOST_PLATFORM == 'win':
     if c.TARGET_BITS == 64:
       # 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':
     shared_library(c, final=False)
   else:  # pragma: no cover
     raise BadConf('Unknown build config "%s"' % c.BUILD_CONFIG)
 
 @config_ctx()
 def disable_aura(c):
   if c.TARGET_PLATFORM == 'win':
@@ skipping 87 matching lines @@
   if c.TARGET_PLATFORM in ('linux', 'win'):
     c.gyp_env.GYP_DEFINES['use_ash'] = 0
     c.gyp_env.GYP_DEFINES['use_aura'] = 0
 
 @config_ctx(includes=['chromium_clang'])
 def blink_clang(c):
   c.compile_py.default_targets = ['all_webkit']
   if c.TARGET_PLATFORM in ('linux', 'win'):
     c.gyp_env.GYP_DEFINES['use_ash'] = 0
     c.gyp_env.GYP_DEFINES['use_aura'] = 0