diff options
5 files changed, 41 insertions, 40 deletions
diff --git a/infra/bots/recipe_modules/skia/api.py b/infra/bots/recipe_modules/skia/api.py index a173601e64..96467eaaff 100644 --- a/infra/bots/recipe_modules/skia/api.py +++ b/infra/bots/recipe_modules/skia/api.py @@ -194,6 +194,9 @@ class SkiaApi(recipe_api.RecipeApi): 'SAN' in self.builder_name) or 'RecreateSKPs' in self.builder_name): self._need_chromium_checkout = True + if 'RecreateSKPs' in self.builder_name: + self.gclient_env['CPPFLAGS'] = ( + '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1') # Some bots also require a checkout of PDFium. self._need_pdfium_checkout = 'PDFium' in self.builder_name diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index fcba352a20..a1a4510ab4 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -84,6 +84,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { + "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gclient runhooks" @@ -151,34 +152,22 @@ }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "runhooks" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gclient runhooks (2)" - }, - { - "cmd": [ - "build/gyp_chromium" + "[CUSTOM_/_B_WORK]/src/buildtools/linux64/gn", + "gen", + "[CUSTOM_/_B_WORK]/src/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/src", "env": { "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja" }, - "name": "gyp_chromium" + "name": "GN" }, { "cmd": [ "ninja", "-C", - "out/Release", + "[CUSTOM_/_B_WORK]/src/out/Release", "chrome" ], "cwd": "[CUSTOM_/_B_WORK]/src", diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json index 51875510ee..756babc7fb 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -84,6 +84,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { + "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gclient runhooks" @@ -151,34 +152,22 @@ }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "runhooks" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gclient runhooks (2)" - }, - { - "cmd": [ - "build/gyp_chromium" + "[CUSTOM_/_B_WORK]/src/buildtools/linux64/gn", + "gen", + "[CUSTOM_/_B_WORK]/src/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/src", "env": { "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja" }, - "name": "gyp_chromium" + "name": "GN" }, { "cmd": [ "ninja", "-C", - "out/Release", + "[CUSTOM_/_B_WORK]/src/out/Release", "chrome" ], "cwd": "[CUSTOM_/_B_WORK]/src", diff --git a/infra/bots/recipes/swarm_RecreateSKPs.py b/infra/bots/recipes/swarm_RecreateSKPs.py index 6863b020b7..49f9c11678 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.py +++ b/infra/bots/recipes/swarm_RecreateSKPs.py @@ -92,20 +92,21 @@ if os.path.isfile(backup_file): def RunSteps(api): # Check out Chrome. api.skia.setup() - api.gclient.runhooks( - env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1'}) src_dir = api.skia.checkout_root.join('src') + out_dir = src_dir.join('out', 'Release') - # Call build/gyp_chromium - api.step('gyp_chromium', - ['build/gyp_chromium'], + # Call GN. + platform = 'linux64' # This bot only runs on linux; don't bother checking. + gn = src_dir.join('buildtools', platform, 'gn') + api.step('GN', + [gn, 'gen', out_dir], env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1', 'GYP_GENERATORS': 'ninja'}, cwd=src_dir) # Build Chrome. api.step('Build Chrome', - ['ninja', '-C', 'out/Release', 'chrome'], + ['ninja', '-C', out_dir, 'chrome'], cwd=src_dir) # Download boto file (needed by recreate_skps.py) to tmp dir. diff --git a/tools/build_command_buffer.py b/tools/build_command_buffer.py index 015cdaf23e..0349419030 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') + 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) |