Commit 2e75e2fa authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot

Collapse symlinks when running "isolate.py remap".

Without this, "mb.py zip" can't include CIPD dependencies, which are
symlinks in the source tree.

Uses kjlubick's earlier work from
https://codereview.chromium.org/2844063005 .

Bug: 850107
Change-Id: Id96b85946ee15bcb2edfcf002016fcaad7b1a98b
Reviewed-on: https://chromium-review.googlesource.com/c/1338238Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608556}
parent e6956d72
...@@ -368,6 +368,7 @@ class MetaBuildWrapper(object): ...@@ -368,6 +368,7 @@ class MetaBuildWrapper(object):
self.PathJoin(self.chromium_src_dir, 'tools', 'swarming_client', self.PathJoin(self.chromium_src_dir, 'tools', 'swarming_client',
'isolate.py'), 'isolate.py'),
'remap', 'remap',
'--collapse_symlinks',
'-s', self.PathJoin(self.args.path, self.args.target + '.isolated'), '-s', self.PathJoin(self.args.path, self.args.target + '.isolated'),
'-o', zip_dir '-o', zip_dir
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment