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

Unified Diff: scripts/slave/recipes/pdfium.py

Issue 2377193002: Revert of Enable goma on pdfium buildbots by default. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | scripts/slave/recipes/pdfium.expected/android.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/pdfium.py
diff --git a/scripts/slave/recipes/pdfium.py b/scripts/slave/recipes/pdfium.py
index 68f08ae07268bc7f3ddfa9d9369754a5be6a21a1..16187a1fad57374f4a9b26a7a0af3da76b0a8188 100644
--- a/scripts/slave/recipes/pdfium.py
+++ b/scripts/slave/recipes/pdfium.py
@@ -5,7 +5,6 @@
DEPS = [
'depot_tools/gclient',
'depot_tools/bot_update',
- 'goma',
'recipe_engine/path',
'recipe_engine/platform',
'recipe_engine/properties',
@@ -55,7 +54,6 @@
def _GNGenBuilds(api, memory_tool, skia, xfa, v8, target_cpu, clang, rel,
target_os, out_dir):
- api.goma.ensure_goma()
gn_bool = {True: 'true', False: 'false'}
# Generate build files by GN.
checkout = api.path['checkout']
@@ -69,8 +67,6 @@
'pdf_enable_xfa=%s' % gn_bool[xfa],
'pdf_use_skia=%s' % gn_bool[skia],
'pdf_is_standalone=true',
- 'use_goma=true',
- 'goma_dir="%s"' % api.goma.goma_dir,
]
if api.platform.is_win and not memory_tool:
args.append('symbol_level=1')
@@ -90,17 +86,10 @@
'--args=' + ' '.join(args)],
cwd=checkout)
-def _BuildSteps(api, clang, out_dir):
+def _BuildSteps(api, out_dir):
# Build sample file using Ninja
debug_path = api.path['checkout'].join('out', out_dir)
- ninja_cmd = ['ninja', '-C', debug_path,
- '-j', api.goma.recommended_goma_jobs]
-
- with api.goma.build_with_goma(
- ninja_log_outdir=debug_path,
- ninja_log_compiler='clang' if clang else 'unknown',
- ninja_log_command=ninja_cmd):
- api.step('compile with ninja', ninja_cmd)
+ api.step('compile with ninja', ['ninja', '-C', debug_path])
def _RunDrMemoryTests(api, v8):
@@ -178,7 +167,7 @@
_GNGenBuilds(api, memory_tool, skia, xfa, v8, target_cpu, clang, rel,
target_os, out_dir)
- _BuildSteps(api, clang, out_dir)
+ _BuildSteps(api, out_dir)
if skip_test:
return
« no previous file with comments | « no previous file | scripts/slave/recipes/pdfium.expected/android.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698