Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: tools/build_command_buffer.py

Issue 2199273002: Fix Chrome build for RecreateSKPs and CommandBuffer bots for GYP->GN (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix platforms for GN Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/build_command_buffer.py
diff --git a/tools/build_command_buffer.py b/tools/build_command_buffer.py
index 015cdaf23ec8a4ce91022a4bf89b1765e2f19427..0349419030f56664f508f9619383ed1a967e1132 100755
--- a/tools/build_command_buffer.py
+++ b/tools/build_command_buffer.py
@@ -130,6 +130,25 @@ def main():
error.cmd, chrome_src_dir))
try:
+ subprocess.check_call([gclient, 'runhooks'], cwd=chrome_src_dir)
+ except subprocess.CalledProcessError as error:
+ sys.exit('Error (ret code: %s) calling "%s" in %s' % (
+ error.returncode, error.cmd, chrome_src_dir))
+
+ platform = 'linux64'
+ if sys.platform == 'darwin':
+ platform = 'mac'
+ elif sys.platform == 'win32':
+ platform = 'win'
+ gn = os.path.join(chrome_src_dir, 'buildtools', platform, 'gn')
jcgregorio 2016/08/02 14:47:49 Wouldn't that be gn.exe on Windows?
borenet 2016/08/02 15:11:56 Good catch. Fixed in https://codereview.chromium.o
+ try:
+ subprocess.check_call([gn, 'gen', chrome_target_dir_rel],
+ cwd=chrome_src_dir)
+ except subprocess.CalledProcessError as error:
+ sys.exit('Error (ret code: %s) calling "%s" in %s' % (
+ error.returncode, error.cmd, chrome_src_dir))
+
+ try:
subprocess.check_call(['ninja'] + shlex.split(args.extra_ninja_args) +
['-C', chrome_target_dir_rel, 'command_buffer_gles2'],
cwd=chrome_src_dir)
« no previous file with comments | « infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698