From f650d9e7cc746d2c2d9cb0a272685a8916357ba7 Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Sat, 10 Jan 2015 01:07:13 +0000 Subject: [PATCH] Switching nacl git recipe for fetch. BUG=None TEST=local R=iannucci@chromium.org Review URL: https://codereview.chromium.org/824153005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293595 0039d316-1c4b-4281-b951-d872f2087c98 --- recipes/nacl.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/recipes/nacl.py b/recipes/nacl.py index 3d83f44d6..59c824c24 100644 --- a/recipes/nacl.py +++ b/recipes/nacl.py @@ -19,28 +19,21 @@ class NaCl(recipe_util.Recipe): solution = { 'name' : 'native_client', 'url' : url, - 'deps_file' : '.DEPS.git', + 'deps_file' : 'DEPS', 'managed' : False, 'custom_deps' : {}, 'safesync_url': '', } spec = { 'solutions': [solution], - 'auto': True } - 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(',') if props.get('target_os_only'): spec['target_os_only'] = props['target_os_only'] - 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, + 'type': 'gclient_git', + 'gclient_git_spec': spec, } @staticmethod