Commit b98f3f25 authored by agable@chromium.org's avatar agable@chromium.org

Revert "Run install-build-deps in the middle of 'fetch chromium'"

This reverts commit 78624b68.

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
parent dc3a1c10
...@@ -62,7 +62,7 @@ class Checkout(object): ...@@ -62,7 +62,7 @@ class Checkout(object):
def run(self, cmd, **kwargs): def run(self, cmd, **kwargs):
print 'Running: %s' % (' '.join(pipes.quote(x) for x in cmd)) print 'Running: %s' % (' '.join(pipes.quote(x) for x in cmd))
if self.options.dry_run: if self.options.dry_run:
return '' return 0
return subprocess.check_output(cmd, **kwargs) return subprocess.check_output(cmd, **kwargs)
...@@ -133,7 +133,7 @@ class GclientGitCheckout(GclientCheckout, GitCheckout): ...@@ -133,7 +133,7 @@ class GclientGitCheckout(GclientCheckout, GitCheckout):
# Configure and do the gclient checkout. # Configure and do the gclient checkout.
self.run_gclient('config', '--spec', self._format_spec()) self.run_gclient('config', '--spec', self._format_spec())
sync_cmd = ['sync'] sync_cmd = ['sync']
if self.options.nohooks or self.spec.get('fetch_hooks'): if self.options.nohooks:
sync_cmd.append('--nohooks') sync_cmd.append('--nohooks')
if self.options.no_history: if self.options.no_history:
sync_cmd.append('--no-history') sync_cmd.append('--no-history')
...@@ -141,11 +141,6 @@ class GclientGitCheckout(GclientCheckout, GitCheckout): ...@@ -141,11 +141,6 @@ class GclientGitCheckout(GclientCheckout, GitCheckout):
sync_cmd.append('--with_branch_heads') sync_cmd.append('--with_branch_heads')
self.run_gclient(*sync_cmd) 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. # Configure git.
wd = os.path.join(self.base, self.root) wd = os.path.join(self.base, self.root)
if self.options.dry_run: if self.options.dry_run:
......
...@@ -31,8 +31,6 @@ class Chromium(recipe_util.Recipe): ...@@ -31,8 +31,6 @@ class Chromium(recipe_util.Recipe):
spec['target_os'] = props['target_os'].split(',') spec['target_os'] = props['target_os'].split(',')
if props.get('target_os_only'): if props.get('target_os_only'):
spec['target_os_only'] = props['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 { return {
'type': 'gclient_git', 'type': 'gclient_git',
'gclient_git_spec': spec, 'gclient_git_spec': spec,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment