Commit 4bd4ee45 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Fix double running of link command for .so files

Some code got copy/pasted, likely due to merge conflicts:
3ed7301e

Bug: None
Change-Id: Iffc859412b65c44c3252dc9f509e9754dac1b7a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410344
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807069}
parent 84e1803f
......@@ -124,15 +124,6 @@ def main():
collect_inputs_only = InterceptFlag('--collect-inputs-only', args.command)
generate_dwp = InterceptFlag('--generate-dwp', args.command)
# First, run the actual link.
command = wrapper_utils.CommandToRun(args.command)
result = wrapper_utils.RunLinkWithOptionalMapFile(command,
env=fast_env,
map_file=args.map_file)
if result != 0:
return result
# If only linking, we are likely generating a partitioned .so that will be
# split apart later. In that case:
#
......
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