Revert "Run install-build-deps in the middle of 'fetch chromium'"
This reverts commit 78624b6839337be8a2ca7e12017aa951ec25a0bd.
The reason is that install-build-deps.sh isn't meant to be run on mac
or windows, and this implementation ran it everywhere.
TBR=dpranke@chromium.org
BUG=229270
Review URL: https://codereview.chromium.org/1186893003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295686 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/fetch.py b/fetch.py
index 03ba986..067d4c6 100755
--- a/fetch.py
+++ b/fetch.py
@@ -62,7 +62,7 @@
def run(self, cmd, **kwargs):
print 'Running: %s' % (' '.join(pipes.quote(x) for x in cmd))
if self.options.dry_run:
- return ''
+ return 0
return subprocess.check_output(cmd, **kwargs)
@@ -133,7 +133,7 @@
# Configure and do the gclient checkout.
self.run_gclient('config', '--spec', self._format_spec())
sync_cmd = ['sync']
- if self.options.nohooks or self.spec.get('fetch_hooks'):
+ if self.options.nohooks:
sync_cmd.append('--nohooks')
if self.options.no_history:
sync_cmd.append('--no-history')
@@ -141,11 +141,6 @@
sync_cmd.append('--with_branch_heads')
self.run_gclient(*sync_cmd)
- for cmd in self.spec.get('fetch_hooks', []):
- self.run(cmd)
- if self.spec.get('fetch_hooks') and not self.options.nohooks:
- self.run_gclient('runhooks')
-
# Configure git.
wd = os.path.join(self.base, self.root)
if self.options.dry_run:
diff --git a/recipes/chromium.py b/recipes/chromium.py
index ccadd1f..6416ee0 100644
--- a/recipes/chromium.py
+++ b/recipes/chromium.py
@@ -31,8 +31,6 @@
spec['target_os'] = props['target_os'].split(',')
if props.get('target_os_only'):
spec['target_os_only'] = props['target_os_only']
- install_build_deps = ['src/build/install-build-deps.sh']
- spec['fetch_hooks'] = [install_build_deps]
return {
'type': 'gclient_git',
'gclient_git_spec': spec,
