diff options
| author |  borenet <borenet@chromium.org> | 2016-08-02 07:02:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-02 07:02:52 -0700 |
| commit | b6aafe66a0f59839bcacdac0b9037136e48f85e9 (patch) | |
| tree | 6d4bbf15f7d98f863d63c8a6e5f2c90155596083 /infra/bots/recipes/swarm_RecreateSKPs.py | |
| parent | ed696276fd5b7cd995e7e75d6c579f16d28bd36a (diff) | |
Fix Chrome build for RecreateSKPs and CommandBuffer bots for GYP->GN
BUG=skia:5597
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2199273002
Review-Url: https://codereview.chromium.org/2199273002
Diffstat (limited to 'infra/bots/recipes/swarm_RecreateSKPs.py')
| -rw-r--r-- | infra/bots/recipes/swarm_RecreateSKPs.py | 13 |
1 files changed, 7 insertions, 6 deletions
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. |