From f32e5329edcf53fb243ea70028294dab273d7404 Mon Sep 17 00:00:00 2001
From: "janx@chromium.org"
 <janx@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 29 Apr 2013 14:03:47 +0000
Subject: [PATCH] Add fetch recipe alias targetting Android

"fetch android" is a basic alias for "fetch chromium --target_os=android",
which adds "target_os=['android']" to the gclient specs as described in
chromium's AndroidBuildInstructions wiki page.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/14315010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@197031 0039d316-1c4b-4281-b951-d872f2087c98
---
 recipes/android.py  | 30 ++++++++++++++++++++++++++++++
 recipes/blink.py    | 19 ++++++++++++-------
 recipes/chromium.py | 10 +++++++---
 3 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 recipes/android.py

diff --git a/recipes/android.py b/recipes/android.py
new file mode 100644
index 0000000000..efc78a32ab
--- /dev/null
+++ b/recipes/android.py
@@ -0,0 +1,30 @@
+# Copyright (c) 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.
+
+import sys
+
+import recipe_util  # pylint: disable=F0401
+
+
+# This class doesn't need an __init__ method, so we disable the warning
+# pylint: disable=W0232
+class Android(recipe_util.Recipe):
+  """Basic Recipe alias for Android -> Chromium."""
+
+  @staticmethod
+  def fetch_spec(props):
+    return {
+      'alias': {
+        'recipe': 'chromium',
+        'props': ['--target_os=android'],
+      },
+    }
+
+
+def main(argv=None):
+  return Android().handle_args(argv)
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
diff --git a/recipes/blink.py b/recipes/blink.py
index fba16fb156..b3dd8f689f 100644
--- a/recipes/blink.py
+++ b/recipes/blink.py
@@ -3,10 +3,12 @@
 # found in the LICENSE file.
 
 import json
-# pylint: disable=F0401
-import recipe_util
 import sys
 
+import recipe_util  # pylint: disable=F0401
+
+
+# This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
 class Blink(recipe_util.Recipe):
   """Basic Recipe alias for Blink -> Chromium."""
@@ -20,16 +22,19 @@ class Blink(recipe_util.Recipe):
         'svn_ref': 'master',
       }
     }
-    return {'alias': {
+    return {
+      'alias': {
         'recipe': 'chromium',
-        'props': ['--webkit_rev=ToT',
-                  '--submodule_git_svn_spec=' + json.dumps(submodule_spec)]
-      }
+        'props': [
+          '--webkit_rev=ToT',
+          '--submodule_git_svn_spec=' + json.dumps(submodule_spec),
+        ],
+      },
     }
 
 
 def main(argv=None):
-  Blink().handle_args(argv)
+  return Blink().handle_args(argv)
 
 
 if __name__ == '__main__':
diff --git a/recipes/chromium.py b/recipes/chromium.py
index b9156ed926..212b5a8eb4 100644
--- a/recipes/chromium.py
+++ b/recipes/chromium.py
@@ -2,10 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# pylint: disable=F0401
-import recipe_util
 import sys
 
+import recipe_util  # pylint: disable=F0401
+
+
+# This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
 class Chromium(recipe_util.Recipe):
   """Basic Recipe class for Chromium."""
@@ -30,13 +32,15 @@ class Chromium(recipe_util.Recipe):
     }
     if props.get('submodule_git_svn_spec'):
       spec['submodule_git_svn_spec'] = props['submodule_git_svn_spec']
+    if props.get('target_os'):
+      spec['target_os'] = props['target_os'].split(',')
     checkout_type = 'gclient_git_svn'
     if props.get('nosvn'):
       checkout_type = 'gclient_git'
     spec_type = '%s_spec' % checkout_type
     return {
       'type': checkout_type,
-      spec_type: spec
+      spec_type: spec,
     }
 
   @staticmethod