aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar borenet <borenet@chromium.org>2016-09-07 08:34:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-07 08:34:13 -0700
commite72daf6116a35da5a8bbac05f11ff5a8800590d5 (patch)
tree8477f0fd5770581a9cee0d1218eb9d46b3220642 /infra
parent7a00e8bc9868f262d13d21c484f978f99e0adb95 (diff)
Run install-sysroot script before 'gn gen' on PDFium bot
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipe_modules/flavor/pdfium_flavor.py8
-rw-r--r--infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json15
2 files changed, 23 insertions, 0 deletions
diff --git a/infra/bots/recipe_modules/flavor/pdfium_flavor.py b/infra/bots/recipe_modules/flavor/pdfium_flavor.py
index 7aa21b2b02..83525fa442 100644
--- a/infra/bots/recipe_modules/flavor/pdfium_flavor.py
+++ b/infra/bots/recipe_modules/flavor/pdfium_flavor.py
@@ -24,6 +24,14 @@ class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
cwd=pdfium_dir,
**kwargs)
+ # Install the sysroot.
+ self.m.run(
+ self.m.step,
+ 'sysroot',
+ cmd=['python', 'build/linux/sysroot_scripts/install-sysroot.py',
+ '--arch=amd64'],
+ cwd=pdfium_dir)
+
# Setup gn args.
gn_args = [
'pdf_use_skia=true',
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json
index 0e138cc4d4..d0f9e30173 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json
@@ -97,6 +97,21 @@
},
{
"cmd": [
+ "python",
+ "build/linux/sysroot_scripts/install-sysroot.py",
+ "--arch=amd64"
+ ],
+ "cwd": "[CUSTOM_/_B_WORK]/pdfium",
+ "env": {
+ "BUILDTYPE": "Release",
+ "CHROME_HEADLESS": "1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
+ },
+ "name": "sysroot"
+ },
+ {
+ "cmd": [
"gn",
"gen",
"out/skia",