diff options
| author |  Eric Boren <borenet@google.com> | 2018-06-01 11:53:42 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 11:53:46 +0000 |
| commit | fbe7166685b860a530ebe545aef5596c6a86c403 (patch) | |
| tree | 794a46b6d3b643ccdbac3d719155dedb38101cd0 /infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json | |
| parent | 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b (diff) | |
Revert "[recipes] Isolate build outputs with no subdirs"
This reverts commit 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b.
Reason for revert: Broke iOS and SwiftShader (and maybe others)
Original change's description:
> [recipes] Isolate build outputs with no subdirs
>
> Bug: skia:6473
> Change-Id: If243b6afb748529d2bdb212e360cd4338edc929c
> Reviewed-on: https://skia-review.googlesource.com/130942
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
TBR=borenet@google.com,benjaminwagner@google.com
Change-Id: Icf9490f2f88dc454c6d971f35258e219137b0c0e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6473
Reviewed-on: https://skia-review.googlesource.com/131400
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json')
| -rw-r--r-- | infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json index bf0a8e4a0d..37b0efacbd 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json @@ -171,7 +171,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ParentRevision/Release", - "[START_DIR]/[SWARM_OUT_DIR]/ParentRevision" + "[START_DIR]/[SWARM_OUT_DIR]/ParentRevision/out/Release" ], "infra_step": true, "name": "copy build products", |