diff options
author | 2018-02-15 06:58:14 -0500 | |
---|---|---|
committer | 2018-02-15 14:29:39 +0000 | |
commit | 98c4231592bfadbe92d906f707d28508c50b0c16 (patch) | |
tree | 67d947c56ee1c71de4b8e6d52056d2b6db9821e6 /infra/bots/recipe_modules/flavor | |
parent | 50a808a518c895c956c6d30d07e1e81e5e7abddb (diff) |
Increase ninja thread count for Android build on Linux.
Change-Id: Ib637360e2f09cd2851771595590203da6195a314
Reviewed-on: https://skia-review.googlesource.com/107600
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor')
4 files changed, 15 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json index 4a935a60a8..6b9f590dad 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release", + "-j", + "1000" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json index 4ec3463d65..a33b98d22f 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release", + "-j", + "1000" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 23d27d727b..7e50545220 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -37,7 +37,9 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", + "-j", + "1000" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index c5c3bbd4b0..a8afc93a9f 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -389,6 +389,11 @@ if actual_freq != str(freq): args['extra_cflags'] = repr(extra_cflags).replace("'", '"') gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in sorted(args.iteritems())) + ninja_args = ['-k', '0', '-C', self.out_dir] + + if self.m.vars.is_linux: + # TODO(dogben): Experiment with this setting for other builds. + ninja_args.extend(['-j', '1000']) gn = 'gn.exe' if 'Win' in os else 'gn' ninja = 'ninja.exe' if 'Win' in os else 'ninja' @@ -396,7 +401,7 @@ if actual_freq != str(freq): self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn')) self._run('gn gen', gn, 'gen', self.out_dir, '--args=' + gn_args) - self._run('ninja', ninja, '-k', '0', '-C', self.out_dir) + self._run('ninja', *([ninja] + ninja_args)) def install(self): self._adb('mkdir ' + self.device_dirs.resource_dir, |