Commit 9105ef45 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

diagnose_bloat.py: Use source tree versions of GN & Ninja

Works around users have random other versions in their PATH.

Bug: 988100
Change-Id: I48111e378b5186e4373fda3927b9cec0922cb391
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724437Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681819}
parent 660f9040
...@@ -39,6 +39,8 @@ _LLVM_TOOLS_DIR = os.path.join( ...@@ -39,6 +39,8 @@ _LLVM_TOOLS_DIR = os.path.join(
_SRC_ROOT, 'third_party', 'llvm-build', 'Release+Asserts', 'bin') _SRC_ROOT, 'third_party', 'llvm-build', 'Release+Asserts', 'bin')
_DOWNLOAD_OBJDUMP_PATH = os.path.join( _DOWNLOAD_OBJDUMP_PATH = os.path.join(
_SRC_ROOT, 'tools', 'clang', 'scripts', 'download_objdump.py') _SRC_ROOT, 'tools', 'clang', 'scripts', 'download_objdump.py')
_GN_PATH = os.path.join(_SRC_ROOT, 'third_party', 'depot_tools', 'gn')
_NINJA_PATH = os.path.join(_SRC_ROOT, 'third_party', 'depot_tools', 'ninja')
_DiffResult = collections.namedtuple('DiffResult', ['name', 'value', 'units']) _DiffResult = collections.namedtuple('DiffResult', ['name', 'value', 'units'])
...@@ -337,10 +339,10 @@ class _BuildHelper(object): ...@@ -337,10 +339,10 @@ class _BuildHelper(object):
gn_args += (' enable_chrome_android_internal=%s' % gn_args += (' enable_chrome_android_internal=%s' %
str(self.enable_chrome_android_internal).lower()) str(self.enable_chrome_android_internal).lower())
gn_args += self.extra_gn_args_str gn_args += self.extra_gn_args_str
return ['gn', 'gen', self.output_directory, '--args=%s' % gn_args] return [_GN_PATH, 'gen', self.output_directory, '--args=%s' % gn_args]
def _GenNinjaCmd(self): def _GenNinjaCmd(self):
cmd = ['ninja', '-C', self.output_directory] cmd = [_NINJA_PATH, '-C', self.output_directory]
cmd += ['-j', self.max_jobs] if self.max_jobs else [] cmd += ['-j', self.max_jobs] if self.max_jobs else []
cmd += ['-l', self.max_load_average] if self.max_load_average else [] cmd += ['-l', self.max_load_average] if self.max_load_average else []
cmd += [self.target] cmd += [self.target]
...@@ -351,7 +353,7 @@ class _BuildHelper(object): ...@@ -351,7 +353,7 @@ class _BuildHelper(object):
logging.info('Building %s within %s (this might take a while).', logging.info('Building %s within %s (this might take a while).',
self.target, os.path.relpath(self.output_directory)) self.target, os.path.relpath(self.output_directory))
if self.clean: if self.clean:
_RunCmd(['gn', 'clean', self.output_directory]) _RunCmd([_GN_PATH, 'clean', self.output_directory])
retcode = _RunCmd( retcode = _RunCmd(
self._GenGnCmd(), verbose=True, exit_on_failure=False)[1] self._GenGnCmd(), verbose=True, exit_on_failure=False)[1]
if retcode: if retcode:
......
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