From 74be2f20950459c957a923ccadea2158c88cad50 Mon Sep 17 00:00:00 2001 From: John Budorick Date: Fri, 28 Apr 2017 18:59:04 -0700 Subject: Manually roll skia recipe deps. This includes: recipes-py: https://chromium.googlesource.com/external/github.com/luci/recipes-py/+log/f5e47cfc28b5964701572db12f96c7a5a3f1821a..554e8878ac6395262dc3c90bbb8a100ee844f766 depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools/+log/109907e6a95ae0301b1564c76c4a3e9d15e19366..1e71b8bdf0913b306b28141192272350cf68cdc2 tools/build: https://chromium.googlesource.com/chromium/tools/build/+log/f7b41106d64b6517c67343f2cfb03f4a9d62afc2..dcca7cbe7ecda2c4d511f38c6f3eab29cad08cf7 The ranges include my generic postprocess/merge change in tools/build that had been failing to roll over in https://skia-review.googlesource.com/c/13920/ along with a few corresponding fixes. Change-Id: I7e328bdb3acfc9b4c219e408c226f181f3b05f3d Reviewed-on: https://skia-review.googlesource.com/14678 Commit-Queue: John Budorick Commit-Queue: Eric Boren Reviewed-by: Michael Achenbach Reviewed-by: Eric Boren --- infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json') diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json index b354814737..dc47399b4f 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", -- cgit v1.2.3