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

Side by Side Diff: infra/bots/recipe_modules/skia/api.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 unified diff | Download patch
« no previous file with comments | « no previous file | infra/bots/recipes/swarm_RecreateSKPs.py » ('j') | tools/build_command_buffer.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 5
6 # pylint: disable=W0201 6 # pylint: disable=W0201
7 7
8 8
9 import json 9 import json
10 import os 10 import os
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 self.infrabots_dir = self.skia_dir.join('infra', 'bots') 187 self.infrabots_dir = self.skia_dir.join('infra', 'bots')
188 188
189 # Some bots also require a checkout of chromium. 189 # Some bots also require a checkout of chromium.
190 self._need_chromium_checkout = 'CommandBuffer' in self.builder_name 190 self._need_chromium_checkout = 'CommandBuffer' in self.builder_name
191 if 'CommandBuffer' in self.builder_name: 191 if 'CommandBuffer' in self.builder_name:
192 self.gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0' 192 self.gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0'
193 if ((self.is_compile_bot and 193 if ((self.is_compile_bot and
194 'SAN' in self.builder_name) or 194 'SAN' in self.builder_name) or
195 'RecreateSKPs' in self.builder_name): 195 'RecreateSKPs' in self.builder_name):
196 self._need_chromium_checkout = True 196 self._need_chromium_checkout = True
197 if 'RecreateSKPs' in self.builder_name:
198 self.gclient_env['CPPFLAGS'] = (
199 '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1')
197 200
198 # Some bots also require a checkout of PDFium. 201 # Some bots also require a checkout of PDFium.
199 self._need_pdfium_checkout = 'PDFium' in self.builder_name 202 self._need_pdfium_checkout = 'PDFium' in self.builder_name
200 203
201 # Check out the Skia code. 204 # Check out the Skia code.
202 self.checkout_steps() 205 self.checkout_steps()
203 206
204 # Obtain the spec for this builder from the Skia repo. Use it to set more 207 # Obtain the spec for this builder from the Skia repo. Use it to set more
205 # properties. 208 # properties.
206 self.builder_spec = self.get_builder_spec(self.skia_dir, self.builder_name) 209 self.builder_spec = self.get_builder_spec(self.skia_dir, self.builder_name)
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 # Don't bother to include role, which is always Test. 833 # Don't bother to include role, which is always Test.
831 # TryBots are uploaded elsewhere so they can use the same key. 834 # TryBots are uploaded elsewhere so they can use the same key.
832 blacklist = ['role', 'is_trybot'] 835 blacklist = ['role', 'is_trybot']
833 836
834 flat = [] 837 flat = []
835 for k in sorted(self.builder_cfg.keys()): 838 for k in sorted(self.builder_cfg.keys()):
836 if k not in blacklist: 839 if k not in blacklist:
837 flat.append(k) 840 flat.append(k)
838 flat.append(self.builder_cfg[k]) 841 flat.append(self.builder_cfg[k])
839 return flat 842 return flat
OLDNEW
« no previous file with comments | « no previous file | infra/bots/recipes/swarm_RecreateSKPs.py » ('j') | tools/build_command_buffer.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698