aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules/flavor/examples
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2018-04-17 15:55:57 -0400
committerGravatar Eric Boren <borenet@google.com>2018-04-19 11:27:46 +0000
commit9599b0fd91778955786fafdcda97e4adb65cabf7 (patch)
treef7ed0b156291484efc5044a20ad04e471935dd7c /infra/bots/recipe_modules/flavor/examples
parenta2b1ed5e9d2852bad5d8e1bddc299e920e73d6e0 (diff)
Reland "[infra] Run recipes through Kitchen"
Bug: skia:7050 Change-Id: Icf0bcfbbc505c90a4e8cee7437037a3037bdf33b Reviewed-on: https://skia-review.googlesource.com/121781 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor/examples')
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json2
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json23
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json23
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json12
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json76
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json90
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json84
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json84
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json64
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json88
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json78
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json76
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json88
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json90
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json78
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json84
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json64
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json16
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json18
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json14
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json70
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json86
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json84
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json90
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json90
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json36
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json76
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json28
38 files changed, 949 insertions, 903 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
index 7a4b54cb69..6dee9daf05 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
@@ -120,7 +120,7 @@
"/path/to/tmp/json",
"copy",
"[CUSTOM_/_B_WORK]/skia/infra/cts/whitelist_devices.json",
- "[CUSTOM_[SWARM_OUT_DIR]]"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy whitelist"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json
index 46007a1083..4295bbb34d 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json
@@ -10,6 +10,9 @@
"https://chromium.googlesource.com/chromium/tools/depot_tools.git"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"name": "git setup"
},
{
@@ -22,6 +25,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
"env": {
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
@@ -35,6 +39,9 @@
"06493714339009216197d59c5413da2a1efdf4a2"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "git checkout"
},
@@ -45,6 +52,9 @@
"HEAD"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "read revision",
"stdout": "/path/to/tmp/",
@@ -61,6 +71,9 @@
"-x"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "git clean"
},
@@ -71,6 +84,9 @@
"sync"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "submodule sync"
},
@@ -83,6 +99,9 @@
"--recursive"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "submodule update"
},
@@ -96,6 +115,7 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium"
},
@@ -111,6 +131,7 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium"
},
@@ -128,6 +149,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium"
},
@@ -145,6 +167,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json
index 9ec8901890..06eff64fc8 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json
@@ -10,6 +10,9 @@
"https://chromium.googlesource.com/chromium/tools/depot_tools.git"
],
"cwd": "[CUSTOM_/_B_WORK]/pdfium",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"name": "git setup"
},
{
@@ -22,6 +25,7 @@
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
"env": {
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
@@ -35,6 +39,9 @@
"06493714339009216197d59c5413da2a1efdf4a2"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "git checkout"
},
@@ -45,6 +52,9 @@
"HEAD"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "read revision",
"stdout": "/path/to/tmp/",
@@ -61,6 +71,9 @@
"-x"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "git clean"
},
@@ -71,6 +84,9 @@
"sync"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "submodule sync"
},
@@ -83,6 +99,9 @@
"--recursive"
],
"cwd": "[CUSTOM_/_B_WORK]/depot_tools",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0"
+ },
"infra_step": true,
"name": "submodule update"
},
@@ -96,6 +115,7 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths"
},
@@ -111,6 +131,7 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths"
},
@@ -128,6 +149,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths"
},
@@ -145,6 +167,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
+ "DEPOT_TOOLS_UPDATE": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
index a127736b05..0181bdde8f 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -26,7 +26,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-clang-format"
@@ -35,7 +35,7 @@
"cmd": [
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=is_debug=false skia_compile_processors=true"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
@@ -43,7 +43,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -53,14 +53,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
index 76d3eadd54..794cdfda44 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -656,7 +656,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -664,7 +664,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -695,7 +695,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -711,7 +711,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -746,30 +746,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -803,7 +803,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
index 8d9e8d0613..2e69c6fcdb 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 4's governor to userspace",
@@ -709,7 +709,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 4 to 0.600000",
@@ -785,7 +785,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Disabling CPU 0",
@@ -837,7 +837,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Disabling CPU 1",
@@ -889,7 +889,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Disabling CPU 2",
@@ -941,7 +941,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Disabling CPU 3",
@@ -992,7 +992,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Lock GPU to 600000000 (and other perf tweaks)",
@@ -1048,7 +1048,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -1056,7 +1056,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -1087,7 +1087,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -1103,7 +1103,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -1138,30 +1138,30 @@
"/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1195,7 +1195,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json
index a49c64fc2b..284f79e890 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to userspace",
@@ -709,7 +709,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 0 to 0.600000",
@@ -785,7 +785,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 2's governor to userspace",
@@ -829,7 +829,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 2 to 0.600000",
@@ -896,7 +896,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -904,7 +904,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -935,7 +935,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -951,7 +951,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -986,30 +986,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1043,7 +1043,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
index 102c4b2f48..bf1d4bb539 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 2's governor to userspace",
@@ -709,7 +709,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 2 to 0.600000",
@@ -785,7 +785,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Disabling CPU 0",
@@ -837,7 +837,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Disabling CPU 1",
@@ -880,7 +880,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -888,7 +888,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -919,7 +919,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -935,7 +935,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -970,30 +970,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1027,7 +1027,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
index 8e534bcbc3..a79b2c4a43 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\", \"-I[START_DIR]/chromebook_x86_64_gles/include\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-L[START_DIR]/chromebook_x86_64_gles/lib\", \"-static-libstdc++\", \"-static-libgcc\", \"-fuse-ld=lld\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,7 +51,7 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"nanobench",
"dm"
],
@@ -60,7 +60,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read chromeos ip",
@@ -152,7 +152,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -194,7 +194,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/resources"
@@ -218,7 +218,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "remount /home/chronos/user/ as exec"
@@ -239,7 +239,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/bin"
@@ -260,7 +260,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/bin"
@@ -328,7 +328,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /home/chronos/user/SKP_VERSION",
@@ -350,7 +350,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/SKP_VERSION"
@@ -371,7 +371,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/skps"
@@ -392,7 +392,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/skps"
@@ -480,7 +480,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /home/chronos/user/SK_IMAGE_VERSION",
@@ -502,7 +502,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/SK_IMAGE_VERSION"
@@ -523,7 +523,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/images"
@@ -544,7 +544,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/images"
@@ -632,7 +632,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /home/chronos/user/SVG_VERSION",
@@ -654,7 +654,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/SVG_VERSION"
@@ -675,7 +675,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/svgs"
@@ -696,7 +696,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/svgs"
@@ -749,7 +749,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
],
"infra_step": true,
"name": "rmtree data"
@@ -764,7 +764,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
],
"infra_step": true,
"name": "makedirs data"
@@ -774,11 +774,11 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n",
- "[START_DIR]/out/Release/nanobench",
+ "[START_DIR]/build/out/Release/nanobench",
"foo@127.0.0.1:/home/chronos/user/bin/nanobench"
],
"infra_step": true,
- "name": "scp [START_DIR]/out/Release/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench",
+ "name": "scp [START_DIR]/build/out/Release/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
@@ -805,7 +805,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "chmod nanobench"
@@ -825,7 +825,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "nanobench"
@@ -836,10 +836,10 @@
"-u",
"\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n",
"foo@127.0.0.1:/home/chronos/user/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
],
"infra_step": true,
- "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data",
+ "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
index b842e12017..24d0b74c80 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=ar=\"[START_DIR]/cast_toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-ar\" cc=\"[START_DIR]/cast_toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-gcc\" cxx=\"[START_DIR]/cast_toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-g++\" extra_cflags=[\"-I[START_DIR]/chromebook_arm_gles/include\", \"-DMESA_EGL_NO_X11_HEADERS\", \"-DSK_NO_COMMAND_BUFFER\", \"-Wno-error=unused-function\", \"-g0\", \"-DDUMMY_cast_toolchain_version=42\"] extra_ldflags=[\"-static-libstdc++\", \"-static-libgcc\", \"-L[START_DIR]/cast_toolchain/armv7a/lib\"] is_debug=false skia_enable_gpu=true skia_use_egl=true skia_use_fontconfig=false skia_use_icu=false skia_use_system_freetype2=false target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,7 +51,7 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"nanobench",
"dm"
],
@@ -60,7 +60,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read chromecast ip",
@@ -98,7 +98,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "adb connect 192.168.1.2:5555"
@@ -115,7 +115,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -161,7 +161,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -179,7 +179,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -197,7 +197,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /cache/skia/resources"
@@ -215,7 +215,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /cache/skia/bin"
@@ -232,7 +232,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /cache/skia/resources",
@@ -298,7 +298,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /cache/skia/SKP_VERSION",
@@ -317,7 +317,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /cache/skia/SKP_VERSION"
@@ -335,7 +335,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /cache/skia/skps"
@@ -353,7 +353,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /cache/skia/skps"
@@ -370,7 +370,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /cache/skia/skps",
@@ -408,7 +408,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION"
@@ -453,7 +453,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /cache/skia/SK_IMAGE_VERSION",
@@ -472,7 +472,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /cache/skia/SK_IMAGE_VERSION"
@@ -490,7 +490,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /cache/skia/images"
@@ -508,7 +508,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /cache/skia/images"
@@ -525,7 +525,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /cache/skia/images",
@@ -563,7 +563,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /cache/skia/SK_IMAGE_VERSION"
@@ -608,7 +608,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /cache/skia/SVG_VERSION",
@@ -627,7 +627,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /cache/skia/SVG_VERSION"
@@ -645,7 +645,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /cache/skia/svgs"
@@ -663,7 +663,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /cache/skia/svgs"
@@ -680,7 +680,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /cache/skia/svgs",
@@ -718,7 +718,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /cache/skia/SVG_VERSION"
@@ -727,7 +727,7 @@
"cmd": [
"adb",
"push",
- "[START_DIR]/out/Release/nanobench",
+ "[START_DIR]/build/out/Release/nanobench",
"/cache/skia/bin"
],
"cwd": "[START_DIR]/skia",
@@ -735,7 +735,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -755,7 +755,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "nanobench"
},
@@ -764,17 +764,17 @@
"adb",
"pull",
"/cache/skia/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /cache/skia/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All/data"
+ "name": "pull /cache/skia/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All/data"
},
{
"cmd": [
@@ -792,7 +792,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Delete executables"
@@ -807,7 +807,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "disconnect"
@@ -822,7 +822,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "adb connect 192.168.1.2:5555 (2)"
@@ -832,13 +832,13 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -871,7 +871,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "disconnect (2)"
@@ -886,7 +886,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
index b96b459acd..ee76a0c657 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_enable_gpu=false skia_use_fontconfig=false"
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -208,7 +208,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
@@ -217,7 +217,7 @@
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan:[START_DIR]/clang_linux/lib",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "symbolized nanobench"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json
index 872a557ffb..92fe33bf2c 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false sanitize=\"ASAN\" skia_enable_spirv_validation=false"
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -208,7 +208,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
- "[START_DIR]/out/Release/nanobench",
+ "[START_DIR]/build/out/Release/nanobench",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
@@ -219,7 +219,7 @@
"LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib",
"LSAN_OPTIONS": "symbolize=1 print_suppressions=1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin",
- "SKIA_OUT": "[START_DIR]/out",
+ "SKIA_OUT": "[START_DIR]/build/out",
"UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1"
},
"name": "symbolized nanobench"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json
index e43a6125cd..84aca5d680 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"] is_debug=false"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -209,7 +209,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
- "[START_DIR]/out/Release/nanobench",
+ "[START_DIR]/build/out/Release/nanobench",
"--some-flag"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
@@ -217,7 +217,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "symbolized nanobench"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
index c51111e371..bdc23572a9 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to hotplug",
@@ -700,7 +700,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Release/dm",
+ "[START_DIR]/build/out/Release/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -708,7 +708,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm"
@@ -739,7 +739,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm.sh"
@@ -755,7 +755,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -790,30 +790,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -847,7 +847,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
index 93d3cc12bd..81ae36b2dd 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -656,7 +656,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/dm",
+ "[START_DIR]/build/out/Debug/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -664,7 +664,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm"
@@ -695,7 +695,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm.sh"
@@ -711,7 +711,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -746,30 +746,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -803,7 +803,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
index 8a809ef1d5..c572958644 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 0",
@@ -717,7 +717,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 1",
@@ -769,7 +769,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 2",
@@ -821,7 +821,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 3",
@@ -873,7 +873,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 4's governor to ondemand",
@@ -917,7 +917,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to ondemand",
@@ -952,7 +952,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/out/Debug/dm",
+ "[START_DIR]/build/out/Debug/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -960,7 +960,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm"
@@ -991,7 +991,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm.sh"
@@ -1007,7 +1007,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -1042,30 +1042,30 @@
"/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1099,7 +1099,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
index d8820d3868..32b907d7f6 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" sanitize=\"ASAN\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Setting up device to run ASAN",
@@ -246,7 +246,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -309,7 +309,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -328,7 +328,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -346,7 +346,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -364,7 +364,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -381,7 +381,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -416,7 +416,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -461,7 +461,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -480,7 +480,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -498,7 +498,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -516,7 +516,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -533,7 +533,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -568,7 +568,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -613,7 +613,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -632,7 +632,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -650,7 +650,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -668,7 +668,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -685,7 +685,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -720,7 +720,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -738,7 +738,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 0",
@@ -790,7 +790,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 1",
@@ -842,7 +842,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 2",
@@ -894,7 +894,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 3",
@@ -946,7 +946,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 4's governor to ondemand",
@@ -990,7 +990,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to ondemand",
@@ -1025,7 +1025,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/out/Release/dm",
+ "[START_DIR]/build/out/Release/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -1033,7 +1033,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm"
@@ -1064,7 +1064,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm.sh"
@@ -1080,7 +1080,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -1115,30 +1115,30 @@
"/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1172,7 +1172,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
index 7afec9ca30..dc3375c907 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to ondemand",
@@ -700,7 +700,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Release/dm",
+ "[START_DIR]/build/out/Release/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -708,7 +708,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm"
@@ -739,7 +739,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm.sh"
@@ -755,7 +755,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -790,30 +790,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -847,7 +847,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
index daae6a84d2..f15b776531 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 0",
@@ -717,7 +717,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Enabling CPU 1",
@@ -769,7 +769,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 2's governor to ondemand",
@@ -813,7 +813,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to ondemand",
@@ -848,7 +848,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/dm",
+ "[START_DIR]/build/out/Debug/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -856,7 +856,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm"
@@ -887,7 +887,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push dm.sh"
@@ -903,7 +903,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -938,30 +938,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -995,7 +995,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
index d6a04707a5..7fe39c92e7 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\", \"-I[START_DIR]/chromebook_x86_64_gles/include\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-L[START_DIR]/chromebook_x86_64_gles/lib\", \"-static-libstdc++\", \"-static-libgcc\", \"-fuse-ld=lld\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,7 +51,7 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"nanobench",
"dm"
],
@@ -60,7 +60,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read chromeos ip",
@@ -152,7 +152,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -194,7 +194,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/resources"
@@ -218,7 +218,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "remount /home/chronos/user/ as exec"
@@ -239,7 +239,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/bin"
@@ -260,7 +260,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/bin"
@@ -328,7 +328,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /home/chronos/user/SKP_VERSION",
@@ -350,7 +350,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/SKP_VERSION"
@@ -371,7 +371,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/skps"
@@ -392,7 +392,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/skps"
@@ -480,7 +480,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /home/chronos/user/SK_IMAGE_VERSION",
@@ -502,7 +502,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/SK_IMAGE_VERSION"
@@ -523,7 +523,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/images"
@@ -544,7 +544,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/images"
@@ -632,7 +632,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /home/chronos/user/SVG_VERSION",
@@ -654,7 +654,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/SVG_VERSION"
@@ -675,7 +675,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /home/chronos/user/svgs"
@@ -696,7 +696,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /home/chronos/user/svgs"
@@ -749,7 +749,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"infra_step": true,
"name": "rmtree dm"
@@ -764,7 +764,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"infra_step": true,
"name": "makedirs dm"
@@ -774,11 +774,11 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n",
- "[START_DIR]/out/Release/dm",
+ "[START_DIR]/build/out/Release/dm",
"foo@127.0.0.1:/home/chronos/user/bin/dm"
],
"infra_step": true,
- "name": "scp [START_DIR]/out/Release/dm foo@127.0.0.1:/home/chronos/user/bin/dm",
+ "name": "scp [START_DIR]/build/out/Release/dm foo@127.0.0.1:/home/chronos/user/bin/dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
@@ -805,7 +805,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "chmod dm"
@@ -825,7 +825,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dm"
@@ -836,10 +836,10 @@
"-u",
"\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n",
"foo@127.0.0.1:/home/chronos/user/dm_out",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"infra_step": true,
- "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm",
+ "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json
index a09291aa3a..c47abceaac 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "devrel",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/devrel",
+ "[START_DIR]/build/out/devrel",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false"
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "devrel",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/devrel"
+ "[START_DIR]/build/out/devrel"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "devrel",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -209,7 +209,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
- "[START_DIR]/out/devrel/dm",
+ "[START_DIR]/build/out/devrel/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
@@ -217,7 +217,7 @@
"BUILDTYPE": "devrel",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "symbolized dm"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json
index 4f45cedc53..605c9adfa5 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\"]"
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -209,16 +209,16 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
- "[START_DIR]/out/Debug/dm",
+ "[START_DIR]/build/out/Debug/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "LLVM_PROFILE_FILE": "[CUSTOM_[SWARM_OUT_DIR]]/All.profraw",
+ "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/All.profraw",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "symbolized dm"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json
index 3affe51f9b..e99d998a86 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] sanitize=\"safe-stack\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -209,7 +209,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
- "[START_DIR]/out/Debug/dm",
+ "[START_DIR]/build/out/Debug/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
@@ -217,7 +217,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "symbolized dm"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
index 912538b018..d282b81bac 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false sanitize=\"TSAN\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -208,7 +208,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
- "[START_DIR]/out/Release/dm",
+ "[START_DIR]/build/out/Release/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
@@ -217,7 +217,7 @@
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin",
- "SKIA_OUT": "[START_DIR]/out",
+ "SKIA_OUT": "[START_DIR]/build/out",
"TSAN_OPTIONS": "report_signal_unsafe=0"
},
"name": "symbolized dm"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json
index 6287cd143b..10c32bee0e 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -19,7 +19,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"gcc\" cxx=\"g++\" is_debug=false"
],
"cwd": "[START_DIR]/skia",
@@ -27,7 +27,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -37,14 +37,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -195,7 +195,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
- "[START_DIR]/out/Release/dm",
+ "[START_DIR]/build/out/Release/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
@@ -203,7 +203,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "symbolized dm"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json
index a7c3bd390d..7060e1938e 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -19,7 +19,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false"
],
"cwd": "[START_DIR]/skia",
@@ -27,7 +27,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -37,14 +37,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -190,7 +190,7 @@
},
{
"cmd": [
- "[START_DIR]/out/Debug/dm",
+ "[START_DIR]/build/out/Debug/dm",
"--some-flag"
],
"env": {
@@ -200,7 +200,7 @@
"LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib",
"LSAN_OPTIONS": "symbolize=1 print_suppressions=1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin",
- "SKIA_OUT": "[START_DIR]/out",
+ "SKIA_OUT": "[START_DIR]/build/out",
"UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1"
},
"name": "dm"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
index ec7f2e27aa..bdda013289 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/linux_vulkan_sdk\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -209,7 +209,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
- "[START_DIR]/out/Debug/dm",
+ "[START_DIR]/build/out/Debug/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
@@ -219,7 +219,7 @@
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
- "SKIA_OUT": "[START_DIR]/out",
+ "SKIA_OUT": "[START_DIR]/build/out",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json"
},
"name": "symbolized dm"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
index fa3ebe8b3f..d29156e398 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -19,7 +19,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"gcc\" cxx=\"g++\" is_debug=false"
],
"cwd": "[START_DIR]/skia",
@@ -27,7 +27,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -37,14 +37,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -197,14 +197,14 @@
"--error-exitcode=1",
"--num-callers=40",
"--suppressions=[START_DIR]/skia/tools/valgrind.supp",
- "[START_DIR]/out/Release/dm",
+ "[START_DIR]/build/out/Release/dm",
"--some-flag"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out",
+ "SKIA_OUT": "[START_DIR]/build/out",
"VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind"
},
"name": "dm"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json
index 4ceff0ec91..f4f3c96cf0 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn.exe",
"gen",
- "[START_DIR]/out/Release_x64",
+ "[START_DIR]/build/out/Release_x64",
"--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release_x64"
+ "[START_DIR]/build/out/Release_x64"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -212,7 +212,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_[SWARM_OUT_DIR]]/dumps"
+ "[START_DIR]/[SWARM_OUT_DIR]/dumps"
],
"infra_step": true,
"name": "makedirs dumps"
@@ -225,15 +225,15 @@
"-e",
"1",
"-x",
- "[CUSTOM_[SWARM_OUT_DIR]]/dumps",
- "[START_DIR]/out/Release_x64/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]/dumps",
+ "[START_DIR]/build/out/Release_x64/dm",
"--some-flag"
],
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "dm"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json
index 580be61a98..8266c565b6 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -19,7 +19,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn.exe",
"gen",
- "[START_DIR]/out/Debug_x64",
+ "[START_DIR]/build/out/Debug_x64",
"--args=win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
],
"cwd": "[START_DIR]/skia",
@@ -27,7 +27,7 @@
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -37,14 +37,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug_x64"
+ "[START_DIR]/build/out/Debug_x64"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -190,14 +190,14 @@
},
{
"cmd": [
- "[START_DIR]/out/Debug_x64/dm",
+ "[START_DIR]/build/out/Debug_x64/dm",
"--some-flag"
],
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "dm"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json
index 9791f171b0..80d565749e 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -19,7 +19,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"]"
],
"cwd": "[START_DIR]/skia",
@@ -27,7 +27,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -37,14 +37,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -58,7 +58,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file file.txt"
@@ -100,7 +100,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -114,7 +114,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -127,7 +127,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "setup_device"
@@ -136,13 +136,13 @@
"cmd": [
"ideviceinstaller",
"-i",
- "[START_DIR]/out/Debug/dm.app"
+ "[START_DIR]/build/out/Debug/dm.app"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "install_dm"
@@ -151,13 +151,13 @@
"cmd": [
"ideviceinstaller",
"-i",
- "[START_DIR]/out/Debug/nanobench.app"
+ "[START_DIR]/build/out/Debug/nanobench.app"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "install_nanobench"
@@ -172,7 +172,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skia/resources"
@@ -214,7 +214,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "cat_file tmp/SKP_VERSION",
@@ -229,7 +229,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm tmp/SKP_VERSION"
@@ -243,7 +243,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm skps"
@@ -257,7 +257,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir skps"
@@ -272,7 +272,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skp"
@@ -287,7 +287,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SKP_VERSION"
@@ -329,7 +329,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "cat_file tmp/SK_IMAGE_VERSION",
@@ -344,7 +344,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm tmp/SK_IMAGE_VERSION"
@@ -358,7 +358,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm images"
@@ -372,7 +372,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir images"
@@ -387,7 +387,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skimage"
@@ -402,7 +402,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
@@ -444,7 +444,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "cat_file tmp/SVG_VERSION",
@@ -459,7 +459,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm tmp/SVG_VERSION"
@@ -473,7 +473,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm svgs"
@@ -487,7 +487,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir svgs"
@@ -502,7 +502,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/svg"
@@ -517,7 +517,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SVG_VERSION"
@@ -534,7 +534,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "dm"
},
@@ -542,13 +542,13 @@
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
"dm",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "pull_if_needed dm"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
index e01b13439a..977b0a5c8d 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to userspace",
@@ -709,7 +709,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 0 to 0.600000",
@@ -787,7 +787,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 0 to 0.600000 (attempt 2)",
@@ -863,7 +863,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 2's governor to userspace",
@@ -907,7 +907,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 2 to 0.600000",
@@ -974,7 +974,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -982,7 +982,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -1013,7 +1013,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -1029,7 +1029,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -1064,30 +1064,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1121,7 +1121,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
index fafc3ea6d3..33b64872a6 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -407,7 +407,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -425,7 +425,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -443,7 +443,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -460,7 +460,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -495,7 +495,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -540,7 +540,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -559,7 +559,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -577,7 +577,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -595,7 +595,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -612,7 +612,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -647,7 +647,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -665,7 +665,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to userspace",
@@ -709,7 +709,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 0 to 0.600000",
@@ -785,7 +785,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 2's governor to userspace",
@@ -829,7 +829,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 2 to 0.600000",
@@ -896,7 +896,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -904,7 +904,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -935,7 +935,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -951,7 +951,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -986,30 +986,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1073,7 +1073,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
index 7fb6a7bd00..f3aa01dafd 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
@@ -173,7 +173,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -236,7 +236,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -255,7 +255,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -273,7 +273,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -308,7 +308,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -343,7 +343,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -388,7 +388,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -408,7 +408,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server after failure of 'read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION' (attempt 1)",
@@ -424,7 +424,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "wait for device after failure of 'read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION' (attempt 1)",
@@ -442,7 +442,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION (attempt 2)",
@@ -461,7 +461,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -479,7 +479,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -497,7 +497,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -514,7 +514,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -549,7 +549,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -594,7 +594,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -613,7 +613,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -631,7 +631,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -649,7 +649,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -666,7 +666,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -701,7 +701,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -719,7 +719,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to userspace",
@@ -763,7 +763,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 0 to 0.600000",
@@ -839,7 +839,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 2's governor to userspace",
@@ -883,7 +883,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 2 to 0.600000",
@@ -950,7 +950,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -958,7 +958,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -989,7 +989,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -1005,7 +1005,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -1040,30 +1040,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1097,7 +1097,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
index 64a8662e3a..ecf9897057 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources",
@@ -175,7 +175,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)",
@@ -191,7 +191,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)",
@@ -210,7 +210,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 2)"
@@ -227,7 +227,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
@@ -290,7 +290,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
@@ -309,7 +309,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -327,7 +327,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
@@ -345,7 +345,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
@@ -362,7 +362,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
@@ -397,7 +397,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
@@ -442,7 +442,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
@@ -461,7 +461,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -479,7 +479,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/images"
@@ -497,7 +497,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
@@ -514,7 +514,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
@@ -549,7 +549,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
@@ -594,7 +594,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
@@ -613,7 +613,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -631,7 +631,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
@@ -649,7 +649,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
@@ -666,7 +666,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
@@ -701,7 +701,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
@@ -719,7 +719,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 0's governor to userspace",
@@ -763,7 +763,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 0 to 0.600000",
@@ -839,7 +839,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Set CPU 2's governor to userspace",
@@ -883,7 +883,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "Scale CPU 2 to 0.600000",
@@ -950,7 +950,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/out/Debug/nanobench",
+ "[START_DIR]/build/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@@ -958,7 +958,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench"
@@ -989,7 +989,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push nanobench.sh"
@@ -1005,7 +1005,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "clear log"
@@ -1040,30 +1040,30 @@
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -1097,7 +1097,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
index 430b4c2bb5..c9f7e84efa 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
@@ -24,7 +24,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -33,7 +33,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Debug",
+ "[START_DIR]/build/out/Debug",
"--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"None\""
],
"cwd": "[START_DIR]/skia",
@@ -41,7 +41,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -51,14 +51,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -74,7 +74,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push file.txt file.txt"
@@ -120,7 +120,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -138,7 +138,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -156,7 +156,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources",
@@ -175,7 +175,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)",
@@ -191,7 +191,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)",
@@ -210,7 +210,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 2)",
@@ -229,7 +229,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 2)",
@@ -245,7 +245,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 2)",
@@ -264,7 +264,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 3)",
@@ -278,13 +278,13 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
- "[START_DIR]/out/Debug"
+ "[START_DIR]/build/out/Debug"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "dump log",
@@ -346,7 +346,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "kill adb server"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
index fb5bd14050..1fb3f7d57f 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -19,7 +19,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"clang\" cxx=\"clang++\" is_debug=false"
],
"cwd": "[START_DIR]/skia",
@@ -27,7 +27,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -37,14 +37,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -58,7 +58,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file file.txt"
@@ -100,7 +100,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -114,7 +114,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -127,7 +127,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "setup_device"
@@ -136,13 +136,13 @@
"cmd": [
"ideviceinstaller",
"-i",
- "[START_DIR]/out/Release/dm.app"
+ "[START_DIR]/build/out/Release/dm.app"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "install_dm",
@@ -161,7 +161,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "uninstall_dm"
@@ -170,13 +170,13 @@
"cmd": [
"ideviceinstaller",
"-i",
- "[START_DIR]/out/Release/dm.app"
+ "[START_DIR]/build/out/Release/dm.app"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "install_dm (attempt 2)"
@@ -185,13 +185,13 @@
"cmd": [
"ideviceinstaller",
"-i",
- "[START_DIR]/out/Release/nanobench.app"
+ "[START_DIR]/build/out/Release/nanobench.app"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "install_nanobench"
@@ -206,7 +206,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skia/resources"
@@ -248,7 +248,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "cat_file tmp/SKP_VERSION",
@@ -263,7 +263,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm tmp/SKP_VERSION"
@@ -277,7 +277,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm skps"
@@ -291,7 +291,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir skps"
@@ -306,7 +306,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skp"
@@ -321,7 +321,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SKP_VERSION"
@@ -363,7 +363,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "cat_file tmp/SK_IMAGE_VERSION",
@@ -378,7 +378,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm tmp/SK_IMAGE_VERSION"
@@ -392,7 +392,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm images"
@@ -406,7 +406,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir images"
@@ -421,7 +421,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skimage"
@@ -436,7 +436,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
@@ -478,7 +478,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "cat_file tmp/SVG_VERSION",
@@ -493,7 +493,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm tmp/SVG_VERSION"
@@ -507,7 +507,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm svgs"
@@ -521,7 +521,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir svgs"
@@ -536,7 +536,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/svg"
@@ -551,7 +551,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SVG_VERSION"
@@ -568,7 +568,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "dm"
},
@@ -576,13 +576,13 @@
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
"dm",
- "[CUSTOM_[SWARM_OUT_DIR]]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]/dm"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "pull_if_needed dm"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
index d8e912d9bc..a439b7fdf5 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
@@ -10,7 +10,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "fetch-gn"
@@ -19,7 +19,7 @@
"cmd": [
"[START_DIR]/skia/bin/gn",
"gen",
- "[START_DIR]/out/Release",
+ "[START_DIR]/build/out/Release",
"--args=cc=\"clang\" cxx=\"clang++\" is_debug=false"
],
"cwd": "[START_DIR]/skia",
@@ -27,7 +27,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "gn gen"
},
@@ -37,14 +37,14 @@
"-k",
"0",
"-C",
- "[START_DIR]/out/Release"
+ "[START_DIR]/build/out/Release"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"name": "ninja"
},
@@ -58,7 +58,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "push_file file.txt"
@@ -100,7 +100,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "rm device_results_dir"
@@ -114,7 +114,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "mkdir device_results_dir"
@@ -127,7 +127,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "setup_device"
@@ -136,13 +136,13 @@
"cmd": [
"ideviceinstaller",
"-i",
- "[START_DIR]/out/Release/dm.app"
+ "[START_DIR]/build/out/Release/dm.app"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "install_dm",
@@ -161,7 +161,7 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "uninstall_dm"
@@ -170,13 +170,13 @@
"cmd": [
"ideviceinstaller",
"-i",
- "[START_DIR]/out/Release/dm.app"
+ "[START_DIR]/build/out/Release/dm.app"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
+ "SKIA_OUT": "[START_DIR]/build/out"
},
"infra_step": true,
"name": "install_dm (attempt 2)",