Roll Recipe DEPS

BUG=skia:

Change-Id: Ic89d1b49aba842fb41c82ad6fc8f5ebe787893bd
Reviewed-on: https://skia-review.googlesource.com/9884
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
This commit is contained in:
Eric Boren 2017-03-20 15:40:12 -04:00 committed by Skia Commit-Bot
parent 3130fbb1a7
commit 53262d0ff4
144 changed files with 274 additions and 1183 deletions

View File

@ -9,6 +9,7 @@ DEPS = [
'recipe_engine/platform',
'recipe_engine/properties',
'recipe_engine/python',
'recipe_engine/step',
'flavor',
'run',
'vars',

View File

@ -39,7 +39,8 @@ class CompileApi(recipe_api.RecipeApi):
try:
for target in build_targets:
self.m.flavor.compile(target, env=env)
with self.m.step.context({'env': env}):
self.m.flavor.compile(target)
self.m.run.copy_build_products(
self.m.flavor.out_dir,
self.m.vars.swarming_out_dir.join(

View File

@ -88,9 +88,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS"
},
@ -107,9 +107,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS"
},
@ -124,9 +124,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS"
},

View File

@ -87,7 +87,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"infra_step": true,
"name": "fetch-gn"
@ -101,7 +102,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "gn gen"
},
@ -113,7 +115,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "ninja"
},

View File

@ -109,12 +109,8 @@
"--make-output-dir"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "build command_buffer"
},
@ -127,9 +123,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
},
@ -146,9 +142,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
},
@ -163,9 +159,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
},

View File

@ -88,9 +88,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN"
},
@ -107,9 +107,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN"
},
@ -124,9 +124,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN"
},

View File

@ -93,7 +93,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"infra_step": true,
"name": "fetch-gn"
@ -107,7 +108,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "gn gen"
},
@ -119,7 +121,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "ninja"
},

View File

@ -87,7 +87,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"infra_step": true,
"name": "fetch-gn"
@ -101,7 +102,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "gn gen"
},
@ -113,7 +115,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "ninja"
},

View File

@ -87,7 +87,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"infra_step": true,
"name": "fetch-gn"
@ -101,7 +102,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "gn gen"
},
@ -113,7 +115,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "ninja"
},

View File

@ -87,7 +87,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"infra_step": true,
"name": "fetch-gn"
@ -101,7 +102,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "gn gen"
},
@ -113,7 +115,8 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "ninja"
},

View File

@ -88,9 +88,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN"
},
@ -107,9 +107,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN"
},
@ -124,9 +124,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN"
},

View File

@ -88,9 +88,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},
@ -107,9 +107,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},
@ -124,9 +124,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},

View File

@ -88,9 +88,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini"
},
@ -107,9 +107,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini"
},
@ -124,9 +124,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini"
},

View File

@ -88,9 +88,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan"
},
@ -107,9 +107,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan"
},
@ -124,9 +124,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan"
},

View File

@ -86,9 +86,6 @@
"[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
@ -100,9 +97,6 @@
"--args=ar=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-ar\" cc=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-gcc\" cxx=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-g++\" extra_cflags=[\"-g0\"] extra_ldflags=[\"-static-libstdc++\", \"-static-libgcc\"] is_debug=false skia_enable_gpu=false skia_use_fontconfig=false skia_use_icu=false skia_use_system_freetype2=false target_cpu=\"arm\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gn gen"
},
{
@ -113,9 +107,6 @@
"nanobench"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "ninja"
},
{

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU"
},

View File

@ -89,8 +89,7 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
},
@ -108,8 +107,7 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
},
@ -125,8 +123,7 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast"
},

View File

@ -96,14 +96,6 @@
"runhooks"
],
"cwd": "[CUSTOM_/_B_WORK]/flutter/src",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android"
},
"name": "runhook"
},
{
@ -126,15 +118,6 @@
"--runtime-mode=release",
"--android"
],
"cwd": "[CUSTOM_/_B_WORK]/flutter/src",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android"
},
"name": "gn_gen"
},
{
@ -144,15 +127,6 @@
"out/android_release",
"-j100"
],
"cwd": "[CUSTOM_/_B_WORK]/flutter/src",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android"
},
"name": "build_flutter"
},
{

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa"
},

View File

@ -97,14 +97,6 @@
"gn_linux64"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
"name": "runhook"
},
{
@ -114,14 +106,6 @@
"--arch=amd64"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
"name": "sysroot"
},
{
@ -133,13 +117,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools"
},
"name": "gn_gen"
},
@ -152,13 +130,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools"
},
"name": "build_pdfium"
},

View File

@ -97,14 +97,6 @@
"gn_linux64"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths"
},
"name": "runhook"
},
{
@ -114,14 +106,6 @@
"--arch=amd64"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths"
},
"name": "sysroot"
},
{
@ -133,13 +117,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths"
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools"
},
"name": "gn_gen"
},
@ -152,13 +130,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths"
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools"
},
"name": "build_pdfium"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind"
},

View File

@ -87,7 +87,8 @@
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"infra_step": true,
"name": "fetch-gn"
@ -101,7 +102,8 @@
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "gn gen"
},
@ -113,7 +115,8 @@
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++"
},
"name": "ninja"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan"
},

View File

@ -89,8 +89,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan"
},
@ -108,8 +106,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan"
},
@ -125,8 +121,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan"
},

View File

@ -95,8 +95,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -114,8 +112,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -131,8 +127,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},

View File

@ -116,8 +116,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -135,8 +133,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -152,8 +148,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},

View File

@ -118,8 +118,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -137,8 +135,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -154,8 +150,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},

View File

@ -100,14 +100,6 @@
"runhooks"
],
"cwd": "[CUSTOM_/_B_WORK]/flutter/src",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android"
},
"name": "runhook"
},
{
@ -130,15 +122,6 @@
"--runtime-mode=release",
"--android"
],
"cwd": "[CUSTOM_/_B_WORK]/flutter/src",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android"
},
"name": "gn_gen"
},
{
@ -148,15 +131,6 @@
"out/android_release",
"-j100"
],
"cwd": "[CUSTOM_/_B_WORK]/flutter/src",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android"
},
"name": "build_flutter"
},
{

View File

@ -101,14 +101,6 @@
"gn_linux64"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
"name": "runhook"
},
{
@ -118,14 +110,6 @@
"--arch=amd64"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
"name": "sysroot"
},
{
@ -137,13 +121,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools"
},
"name": "gn_gen"
},
@ -156,13 +134,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools"
},
"name": "build_pdfium"
},

View File

@ -116,8 +116,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
},
@ -135,8 +133,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
},
@ -152,8 +148,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
},

View File

@ -142,8 +142,6 @@ class SkiaApi(recipe_api.RecipeApi):
self.update_repo(self.m.vars.checkout_root, chromium)
# Run bot_update.
checkout_kwargs = {}
checkout_kwargs['env'] = self.m.vars.default_env
# Hack the patch ref if necessary.
if self.m.properties.get('patch_storage', '') == 'gerrit':
@ -155,14 +153,14 @@ class SkiaApi(recipe_api.RecipeApi):
)
self.m.gclient.c = gclient_cfg
with self.m.step.context({'cwd': self.m.vars.checkout_root}):
update_step = self.m.bot_update.ensure_checkout(
patch_root=patch_root,
**checkout_kwargs)
with self.m.step.context({'cwd': self.m.vars.checkout_root,
'env': self.m.vars.default_env}):
update_step = self.m.bot_update.ensure_checkout(patch_root=patch_root)
self.m.vars.got_revision = (
update_step.presentation.properties['got_revision'])
if self.m.vars.need_chromium_checkout:
with self.m.step.context({'cwd': self.m.vars.checkout_root}):
self.m.gclient.runhooks(env=self.m.vars.gclient_env)
with self.m.step.context({'cwd': self.m.vars.checkout_root,
'env': self.m.vars.gclient_env}):
self.m.gclient.runhooks()

View File

@ -6,6 +6,7 @@ DEPS = [
'build/adb',
'build/file',
'builder_name_schema',
'depot_tools/bot_update',
'recipe_engine/path',
'recipe_engine/platform',
'recipe_engine/properties',

View File

@ -71,8 +71,8 @@ class SkiaFlavorApi(recipe_api.RecipeApi):
def step(self, name, cmd, **kwargs):
return self._f.step(name, cmd, **kwargs)
def compile(self, target, **kwargs):
return self._f.compile(target, **kwargs)
def compile(self, target):
return self._f.compile(target)
def copy_extra_build_products(self, swarming_out_dir):
return self._f.copy_extra_build_products(swarming_out_dir)

View File

@ -12,7 +12,7 @@ import default_flavor
class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils):
def compile(self, target, **kwargs):
def compile(self, target):
"""Build Flutter with Skia."""
flutter_dir = self.m.vars.checkout_root.join('src')
@ -20,13 +20,13 @@ class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils):
extra_config = self.m.vars.builder_cfg.get('extra_config', '')
out_dir = configuration
# Runhook to generate the gn binary in buildtools.
self.m.run(
self.m.step,
'runhook',
cmd=['gclient', 'runhooks'],
cwd=flutter_dir,
**kwargs)
with self.m.step.context({'cwd': flutter_dir}):
# Runhook to generate the gn binary in buildtools.
self.m.run(
self.m.step,
'runhook',
cmd=['gclient', 'runhooks'])
# Setup GN args.
gn_args = [
@ -43,14 +43,10 @@ class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils):
self.m.run(
self.m.step,
'gn_gen',
cmd=['flutter/tools/gn'] + gn_args,
cwd=flutter_dir,
**kwargs)
cmd=['flutter/tools/gn'] + gn_args)
# Build Flutter.
self.m.run(
self.m.step,
'build_flutter',
cmd=['ninja', '-C', 'out/' + out_dir, '-j100'],
cwd=flutter_dir,
**kwargs)
cmd=['ninja', '-C', 'out/' + out_dir, '-j100'])

View File

@ -30,13 +30,14 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
def _run(self, title, *cmd, **kwargs):
self._strip_environment()
return self.m.run(self.m.step, title, cmd=list(cmd),
cwd=self.m.vars.skia_dir, **kwargs)
with self.m.step.context({'cwd': self.m.vars.skia_dir}):
return self.m.run(self.m.step, title, cmd=list(cmd), **kwargs)
def _py(self, title, script, infra_step=True):
self._strip_environment()
return self.m.run(self.m.python, title, script=script,
cwd=self.m.vars.skia_dir, env=None, infra_step=infra_step)
with self.m.step.context({'cwd': self.m.vars.skia_dir}):
return self.m.run(self.m.python, title, script=script,
infra_step=infra_step)
def _adb(self, title, *cmd, **kwargs):
self._ever_ran_adb = True
@ -81,7 +82,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
infra_step=True)
def compile(self, unused_target, **kwargs):
def compile(self, unused_target):
compiler = self.m.vars.builder_cfg.get('compiler')
configuration = self.m.vars.builder_cfg.get('configuration')
extra_config = self.m.vars.builder_cfg.get('extra_config', '')
@ -169,7 +170,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
if self._ever_ran_adb:
self._adb('kill adb server', 'kill-server')
def step(self, name, cmd, env=None, **kwargs):
def step(self, name, cmd, **kwargs):
app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0])
self._adb('push %s' % cmd[0],
'push', app, self.m.vars.android_bin_dir)
@ -218,7 +219,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
subprocess.check_call(['adb', 'push',
os.path.realpath(os.path.join(host, p, f)),
os.path.join(device, p, f)])
""", args=[host, device], cwd=self.m.vars.skia_dir, infra_step=True)
""", args=[host, device], infra_step=True)
def copy_directory_contents_to_host(self, device, host):
self._adb('pull %s %s' % (device, host), 'pull', device, host)

View File

@ -14,7 +14,7 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils):
def __init__(self, m):
super(GNChromecastFlavorUtils, self).__init__(m)
def compile(self, unused_target, **kwargs):
def compile(self, unused_target):
configuration = self.m.vars.builder_cfg.get('configuration')
os = self.m.vars.builder_cfg.get('os')
target_arch = self.m.vars.builder_cfg.get('target_arch')

View File

@ -6,13 +6,13 @@ import default_flavor
"""GN flavor utils, used for building Skia with GN."""
class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
def _run(self, title, cmd, env=None, infra_step=False):
def _run(self, title, cmd, infra_step=False):
self.m.run(self.m.step, title, cmd=cmd,
env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step)
infra_step=infra_step)
def _py(self, title, script, env=None, infra_step=True, args=()):
def _py(self, title, script, infra_step=True, args=()):
self.m.run(self.m.python, title, script=script, args=args,
env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step)
infra_step=infra_step)
def build_command_buffer(self):
self.m.run(self.m.python, 'build command_buffer',
@ -22,7 +22,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
'--output-dir', self.m.vars.skia_out.join(self.m.vars.configuration),
'--no-sync', '--make-output-dir'])
def compile(self, unused_target, **kwargs):
def compile(self, unused_target):
"""Build Skia with GN."""
compiler = self.m.vars.builder_cfg.get('compiler', '')
configuration = self.m.vars.builder_cfg.get('configuration', '')
@ -124,9 +124,16 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
ninja = 'ninja.exe' if 'Win' in os else 'ninja'
gn = self.m.vars.skia_dir.join('bin', gn)
self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn'))
self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args])
self._run('ninja', [ninja, '-C', self.out_dir])
env = self.m.step.get_from_context('env', {})
env.update(self.m.vars.default_env)
env['PATH'] = self.m.path.pathsep.join([
env.get('PATH', '%(PATH)s'),
str(self.m.bot_update._module.PACKAGE_REPO_ROOT),
])
with self.m.step.context({'cwd': self.m.vars.skia_dir, 'env': env}):
self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn'))
self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args])
self._run('ninja', [ninja, '-C', self.out_dir])
def copy_extra_build_products(self, swarming_out_dir):
configuration = self.m.vars.builder_cfg.get('configuration', '')
@ -139,10 +146,10 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
win_vulkan_sdk,
swarming_out_dir.join('out', configuration + '_x64'))
def step(self, name, cmd, env=None, **kwargs):
def step(self, name, cmd):
app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0])
cmd = [app] + cmd[1:]
env = env or {}
env = self.m.step.get_from_context('env') or {}
clang_linux = str(self.m.vars.slave_dir.join('clang_linux'))
extra_config = self.m.vars.builder_cfg.get('extra_config', '')
@ -167,12 +174,13 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
# Convert path objects or placeholders into strings such that they can
# be passed to symbolize_stack_trace.py
args = [self.m.vars.slave_dir] + [str(x) for x in cmd]
self._py('symbolized %s' % name,
self.m.vars.infrabots_dir.join('recipe_modules', 'core',
'resources', 'symbolize_stack_trace.py'),
args=args,
env=env,
infra_step=False)
with self.m.step.context({'cwd': self.m.vars.skia_dir, 'env': env}):
self._py('symbolized %s' % name,
self.m.vars.infrabots_dir.join('recipe_modules', 'core',
'resources', 'symbolize_stack_trace.py'),
args=args,
infra_step=False)
else:
self._run(name, cmd, env=env)
with self.m.step.context({'env': env}):
self._run(name, cmd)

View File

@ -12,53 +12,47 @@ import default_flavor
class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
def compile(self, target, **kwargs):
def compile(self, target):
"""Build PDFium with Skia."""
pdfium_dir = self.m.vars.checkout_root.join('pdfium')
# Runhook to generate the gn binary in buildtools.
self.m.run(
self.m.step,
'runhook',
cmd=['gclient', 'runhook', 'gn_linux64'],
cwd=pdfium_dir,
**kwargs)
with self.m.step.context({'cwd': pdfium_dir}):
self.m.run(
self.m.step,
'runhook',
cmd=['gclient', 'runhook', 'gn_linux64'])
# Install the sysroot.
self.m.run(
self.m.step,
'sysroot',
cmd=['python', 'build/linux/sysroot_scripts/install-sysroot.py',
'--arch=amd64'],
cwd=pdfium_dir)
# Install the sysroot.
self.m.run(
self.m.step,
'sysroot',
cmd=['python', 'build/linux/sysroot_scripts/install-sysroot.py',
'--arch=amd64'])
# Setup gn args.
gn_args = [
'pdf_is_standalone=true',
'clang_use_chrome_plugins=false',
'is_component_build=false',
'is_debug=false',
]
if 'SkiaPaths' in self.m.vars.builder_name:
gn_args.append('pdf_use_skia_paths=true')
else:
gn_args.append('pdf_use_skia=true')
# Setup gn args.
gn_args = [
'pdf_is_standalone=true',
'clang_use_chrome_plugins=false',
'is_component_build=false',
'is_debug=false',
]
if 'SkiaPaths' in self.m.vars.builder_name:
gn_args.append('pdf_use_skia_paths=true')
else:
gn_args.append('pdf_use_skia=true')
env = kwargs.pop('env', {})
env['CHROMIUM_BUILDTOOLS_PATH'] = str(pdfium_dir.join('buildtools'))
self.m.run(
self.m.step,
'gn_gen',
cmd=['gn', 'gen', 'out/skia', '--args=%s' % ' '.join(gn_args)],
cwd=pdfium_dir,
env=env)
env = self.m.step.get_from_context('env') or {}
env['CHROMIUM_BUILDTOOLS_PATH'] = str(pdfium_dir.join('buildtools'))
with self.m.step.context({'env': env}):
self.m.run(
self.m.step,
'gn_gen',
cmd=['gn', 'gen', 'out/skia', '--args=%s' % ' '.join(gn_args)])
# Build PDFium.
self.m.run(
self.m.step,
'build_pdfium',
cmd=['ninja', '-C', 'out/skia', '-j100'],
cwd=pdfium_dir,
env=env,
**kwargs)
# Build PDFium.
self.m.run(
self.m.step,
'build_pdfium',
cmd=['ninja', '-C', 'out/skia', '-j100'])

View File

@ -24,9 +24,11 @@ class InfraApi(recipe_api.RecipeApi):
This fails flakily sometimes, so perform multiple attempts.
"""
self.m.run.with_retry(
self.m.step,
'update go pkgs',
UPDATE_GO_ATTEMPTS,
cmd=['go', 'get', '-u', '-t', '%s/...' % INFRA_GO_PKG],
env=self.go_env)
env = self.m.step.get_from_context('env') or {}
env.update(self.go_env)
with self.m.step.context({'env': env}):
self.m.run.with_retry(
self.m.step,
'update go pkgs',
UPDATE_GO_ATTEMPTS,
cmd=['go', 'get', '-u', '-t', '%s/...' % INFRA_GO_PKG])

View File

@ -25,10 +25,8 @@ def RunSteps(api):
# Run the infra tests.
infra_tests = api.vars.skia_dir.join(
'infra', 'bots', 'infra_tests.py')
with api.step.context({'cwd': api.vars.skia_dir}):
api.step('infra_tests',
cmd=['python', infra_tests],
env=api.infra.go_env)
with api.step.context({'cwd': api.vars.skia_dir, 'env': api.infra.go_env}):
api.step('infra_tests', cmd=['python', infra_tests])
def GenTests(api):

View File

@ -10,6 +10,7 @@ DEPS = [
'recipe_engine/platform',
'recipe_engine/properties',
'recipe_engine/raw_io',
'recipe_engine/step',
'recipe_engine/time',
'run',
'flavor',

View File

@ -224,9 +224,9 @@ def perf_steps(api):
if '_AbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''):
args.extend(['--abandonGpuContext', '--nocpu'])
api.run(api.flavor.step, target, cmd=args,
abort_on_failure=False,
env=env)
with api.step.context({'env': env}):
api.run(api.flavor.step, target, cmd=args,
abort_on_failure=False)
# Copy results to swarming out dir.
if api.vars.upload_perf_results:

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [

View File

@ -174,7 +174,6 @@
"os",
"Mac"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",

View File

@ -108,7 +108,6 @@
"~inc0.webp",
"~inc1.webp"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",

View File

@ -114,7 +114,6 @@
"~inc0.webp",
"~inc1.webp"
],
"cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",

View File

@ -171,7 +171,6 @@
"os",
"Win"
],
"cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",

View File

@ -177,7 +177,6 @@
"os",
"Win10"
],
"cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",

View File

@ -117,7 +117,6 @@
"~inc0.webp",
"~inc1.webp"
],
"cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",

View File

@ -179,7 +179,6 @@
"os",
"Win8"
],
"cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",

View File

@ -5,12 +5,6 @@
"[START_DIR]/skia/resources",
"resources"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "push_if_needed [START_DIR]/skia/resources"
},
{
@ -40,12 +34,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "cat_file tmp/SKP_VERSION",
"stdout": "/path/to/tmp/"
},
@ -54,12 +42,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "rm tmp/SKP_VERSION"
},
{
@ -67,12 +49,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skps"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "rm skps"
},
{
@ -80,12 +56,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skps"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "mkdir skps"
},
{
@ -94,12 +64,6 @@
"[START_DIR]/skp",
"skps"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "push_if_needed [START_DIR]/skp"
},
{
@ -108,12 +72,6 @@
"[START_DIR]/tmp/SKP_VERSION",
"tmp/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "push_file [START_DIR]/tmp/SKP_VERSION"
},
{
@ -143,12 +101,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "cat_file tmp/SK_IMAGE_VERSION",
"stdout": "/path/to/tmp/"
},
@ -157,12 +109,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "rm tmp/SK_IMAGE_VERSION"
},
{
@ -170,12 +116,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"images"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "rm images"
},
{
@ -183,12 +123,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"images"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "mkdir images"
},
{
@ -197,12 +131,6 @@
"[START_DIR]/skimage",
"images"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "push_if_needed [START_DIR]/skimage"
},
{
@ -211,12 +139,6 @@
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"tmp/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
},
{
@ -246,12 +168,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "cat_file tmp/SVG_VERSION",
"stdout": "/path/to/tmp/"
},
@ -260,12 +176,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "rm tmp/SVG_VERSION"
},
{
@ -273,12 +183,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"svgs"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "rm svgs"
},
{
@ -286,12 +190,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"svgs"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "mkdir svgs"
},
{
@ -300,12 +198,6 @@
"[START_DIR]/svg",
"svgs"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "push_if_needed [START_DIR]/svg"
},
{
@ -314,12 +206,6 @@
"[START_DIR]/tmp/SVG_VERSION",
"tmp/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "push_file [START_DIR]/tmp/SVG_VERSION"
},
{
@ -327,12 +213,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"perf"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "rm perf"
},
{
@ -340,12 +220,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"perf"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "mkdir perf"
},
{
@ -355,7 +229,6 @@
"[START_DIR]/skia/gn/package_ios.py",
"[START_DIR]/out/Release/nanobench"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
@ -374,7 +247,6 @@
"--args",
"--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
@ -411,12 +283,6 @@
"perf",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "pull_if_needed perf"
},
{

View File

@ -179,7 +179,6 @@
"os",
"Win8"
],
"cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",

View File

@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [

View File

@ -213,7 +213,6 @@
"os",
"Win8"
],
"cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",

View File

@ -68,29 +68,21 @@ class SkiaStepApi(recipe_api.RecipeApi):
def rmtree(self, path):
"""Wrapper around api.file.rmtree with environment fix."""
env = {}
env = self.m.step.get_from_context('env') or {}
env['PYTHONPATH'] = str(self.m.path['start_dir'].join(
'skia', 'infra', 'bots', '.recipe_deps', 'build', 'scripts'))
self.m.file.rmtree(self.m.path.basename(path),
path,
env=env,
infra_step=True)
def _run(self, steptype, **kwargs):
"""Wrapper for running a step."""
cwd = kwargs.pop('cwd', None)
if cwd:
with self.m.step.context({'cwd': cwd}):
return steptype(**kwargs)
return steptype(**kwargs)
with self.m.step.context({'env': env}):
self.m.file.rmtree(self.m.path.basename(path),
path,
infra_step=True)
def __call__(self, steptype, name, abort_on_failure=True,
fail_build_on_failure=True, env=None, **kwargs):
fail_build_on_failure=True, **kwargs):
"""Run a step. If it fails, keep going but mark the build status failed."""
env = env or {}
env = self.m.step.get_from_context('env') or {}
env.update(self.m.vars.default_env)
try:
return self._run(steptype, name=name, env=env, **kwargs)
return steptype(name=name, **kwargs)
except self.m.step.StepFailure as e:
if abort_on_failure or fail_build_on_failure:
self._failed.append(e)
@ -135,7 +127,7 @@ for pattern in build_products_whitelist:
if attempt > 0:
step_name += ' (attempt %d)' % (attempt + 1)
try:
res = self._run(steptype, name=step_name, **kwargs)
res = self(steptype, name=step_name, **kwargs)
return res
except self.m.step.StepFailure:
if attempt == attempts - 1:

View File

@ -12,8 +12,8 @@ from recipe_engine import recipe_api
def _run(api, title, *cmd, **kwargs):
return api.run(api.step, title, cmd=list(cmd),
cwd=api.vars.skia_dir, **kwargs)
with api.step.context({'cwd': api.vars.skia_dir}):
return api.run(api.step, title, cmd=list(cmd), **kwargs)
def _adb(api, title, *cmd, **kwargs):

View File

@ -163,7 +163,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [

View File

@ -163,7 +163,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [

View File

@ -11,6 +11,7 @@ DEPS = [
'recipe_engine/properties',
'recipe_engine/python',
'recipe_engine/raw_io',
'recipe_engine/step',
'flavor',
'run',
'vars',

View File

@ -511,7 +511,6 @@ def test_steps(api):
time.sleep(waittime)
""",
args=[host_hashes_file],
cwd=api.vars.skia_dir,
abort_on_failure=False,
fail_build_on_failure=False,
infra_step=True)
@ -600,9 +599,8 @@ def test_steps(api):
if '_PreAbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''):
args.append('--preAbandonGpuContext')
api.run(api.flavor.step, 'dm', cmd=args,
abort_on_failure=False,
env=env)
with api.step.context({'env': env}):
api.run(api.flavor.step, 'dm', cmd=args, abort_on_failure=False)
if api.vars.upload_dm_results:
# Copy images and JSON to host machine if needed.

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -465,7 +461,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -516,7 +512,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -516,7 +512,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@ -516,7 +512,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -132,12 +132,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out"
},
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@ -617,7 +611,6 @@
"_",
"blurcircles"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",

View File

@ -132,12 +132,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out"
},
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@ -519,7 +513,6 @@
"_",
"complexclip4_aa"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",

View File

@ -132,12 +132,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out"
},
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@ -414,7 +408,6 @@
"_",
".SRW"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",

View File

@ -132,12 +132,6 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out"
},
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [

View File

@ -423,7 +423,6 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"LSAN_OPTIONS": "symbolize=1 print_suppressions=1",
"PATH": "%(PATH)s:[START_DIR]/clang_linux/bin",
"SKIA_OUT": "[START_DIR]/out",
"UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1"
},

View File

@ -425,7 +425,6 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan",
"PATH": "%(PATH)s:[START_DIR]/clang_linux/bin",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "symbolized dm"

Some files were not shown because too many files have changed in this diff Show More