diff options
| author |  Stephan Altmueller <stephana@google.com> | 2018-02-20 10:05:14 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-20 15:26:34 +0000 |
| commit | c9a025de53a156b4457f74f9a1517696979f514a (patch) | |
| tree | 70a1dc081b99eb7c09b123e30edb80994fd0c147 /infra/bots/recipe_modules/flavor/examples | |
| parent | a3d9e21f0436cf7eb33dee8f060b1332f8cf1b6e (diff) | |
Revert "Increase ninja thread count for Android build on Linux."
also
Revert "Increase ninja thread count for Windows builds."
This reverts commit 98c4231592bfadbe92d906f707d28508c50b0c16.
This reverts commit 50a808a518c895c956c6d30d07e1e81e5e7abddb.
Bug: skia:
Change-Id: I7cc50b0bec6e1ad9f9d971a5c88c029488bb80ed
Reviewed-on: https://skia-review.googlesource.com/108504
Reviewed-by: Stephan Altmueller <stephana@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Stephan Altmueller <stephana@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor/examples')
8 files changed, 8 insertions, 24 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json index 6b9f590dad..4a935a60a8 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release", - "-j", - "1000" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json index a33b98d22f..4ec3463d65 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release", - "-j", - "1000" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 7e50545220..23d27d727b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", - "-j", - "1000" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json index 58fbd480cc..609fa0796e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index 000ec21e9a..c6e64880f9 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json index 2d5be8c5f6..28ec945aa8 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 74ccbbe378..bf08caa1a5 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug", - "-j", - "1000" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { 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 ecb2aeff38..301fcd2878 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 @@ -37,9 +37,7 @@ "-k", "0", "-C", - "[START_DIR]/out/Debug_x64", - "-j", - "1000" + "[START_DIR]/out/Debug_x64" ], "cwd": "[START_DIR]/skia", "env": { |