Add GN conversions for more GYP flags

build/gyp_chromium

 #!/usr/bin/env python
 
 # Copyright (c) 2012 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.
 
 # This script is wrapper for Chromium that adds some support for how GYP
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
 import glob
@@ skipping 97 matching lines @@
   return vars_dict
 
 
 def GetArgsStringForGN(supplemental_files):
   """Returns the args to pass to GN.
   Based on a subset of the GYP variables that have been rewritten a bit."""
 
   vars_dict = GetGypVarsForGN(supplemental_files)
   gn_args = ''
 
+  # Note: These are the additional flags passed to various builds by builders
+  # on the main waterfall. We'll probably need to add these at some point:
+  #   mac_strip_release=1         http://crbug.com/330301
+  #   linux_dump_symbols=0        http://crbug.com/330300
+  #   host_os=linux  Probably can skip, GN knows the host OS.

[Nico, 2014/02/10 22:04:14]

(This is used by the android webview build, which apparently uses this define to
create mac-hosted makefiles while gypping on linux.)

+  #   gcc_version=46  Hopefully we can skip this and fix whatever uses it.
+  #   order_text_section=<path>   http://crbug.com/330299
+  #   chromium_win_pch=0          http://crbug.com/297678
+  #   clang_use_chrome_plugins=1  http://crbug.com/330298
+  #   chromium_ios_signing=0      http://crbug.com/330302
+  #   linux_use_tcmalloc=0        http://crbug.com/330303
+  #   release_extra_flags=...     http://crbug.com/330305
+
   # These tuples of (key, value, gn_arg_string) use the gn_arg_string for
   # gn when the key is set to the given value in the GYP arguments.
   remap_cases = [
       ('branding', 'Chrome', 'is_chrome_branded=true'),
       ('buildtype', 'Official', 'is_official_build=true'),
       ('component', 'shared_library', 'is_component_build=true'),
       ('clang', '1', 'is_clang=true'),
+      ('target_arch', 'ia32', 'cpu_arch="x86"'),
+      ('target_arch', 'x64', 'cpu_arch="x64"'),
+      ('target_arch', 'arm', 'cpu_arch="arm"'),
+      ('fastbuild', '0', 'symbol_level=2'),
+      ('fastbuild', '1', 'symbol_level=1'),
+      ('fastbuild', '2', 'symbol_level=0'),
+      ('OS', 'ios', 'os="ios"'),
+      ('OS', 'android', 'os="android"'),
+      ('chromeos', '1', 'os="chromeos"'),
+      ('use_aura', '1', 'use_aura=true'),
+      ('asan', '1', 'is_asan=true'),
+      ('lsan', '1', 'is_lsan=true'),
   ]
   for i in remap_cases:
     if i[0] in vars_dict and vars_dict[i[0]] == i[1]:
       gn_args += ' ' + i[2]
 
   # These string arguments get passed directly.
   for v in ['windows_sdk_path']:
     if v in vars_dict:
       gn_args += ' ' + v + '=' + EscapeStringForGN(vars_dict[v])
 
@@ skipping 178 matching lines @@
   # to enfore syntax checking.
   syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
   if syntax_check and int(syntax_check):
     args.append('--check')
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   sys.exit(gyp.main(args))