Work on Android GN build.

Adds arm version and some android configuration build flags.

This adds most of the logic from common.gypi to the Android GN build.

This is currently missing the crtbegin/end stuff and won't actually make real Android builds. The logic in this patch is just the initial conversion that will require testing and several more passes of fixes.

R=torne@chromium.org, torne

Review URL: https://codereview.chromium.org/121173005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243681 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 2 deletions

diff --git a/build/gyp_chromium b/build/gyp_chromium
index 172ce85..fd33545 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -148,6 +148,7 @@ def GetArgsStringForGN(supplemental_files):
   # 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'),
@@ -171,11 +172,17 @@ def GetArgsStringForGN(supplemental_files):
     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])
+
   # Some other flags come from GYP environment variables.
   gyp_msvs_version = os.environ.get('GYP_MSVS_VERSION', '')
   if gyp_msvs_version: