Work on Android GN build.

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 113 matching lines @@
   #   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 = [
+      ('android_webview_build', '1', 'is_android_webview_build=true'),
       ('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"'),
       ('target_arch', 'mipsel', 'cpu_arch="mipsel"'),
       ('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']:
+  # These string arguments get passed directly as GN strings.
+  for v in ['android_src', 'windows_sdk_path']:
     if v in vars_dict:
       gn_args += ' ' + v + '=' + EscapeStringForGN(vars_dict[v])
 
+  # These arguments get passed directly as integers (avoiding the quoting and
+  # escaping of the string ones above).
+  for v in ['arm_version']:
+    if v in vars_dict:
+      gn_args += ' %s=%s' % (v, vars_dict[v])
+
   # Set the GYP flag so BUILD files know they're being invoked in GYP mode.
   gn_args += ' is_gyp=true'
   return gn_args.strip()
 
 
 def additional_include_files(supplemental_files, args=[]):
   """
   Returns a list of additional (.gypi) files to include, without duplicating
   ones that are already specified on the command line. The list of supplemental
   include files is passed in as an argument.
@@ skipping 168 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))