Commit ed0050fd authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Revert "SuperSize: Fix console's Disassemble not using stored toolchain"

This reverts commit 90feb41b.

Reason for revert: Broke disassembling with ndk for apks

Original change's description:
> SuperSize: Fix console's Disassemble not using stored toolchain
> 
> Just something that came up when I was trying to use it.
> 
> Bug: 999351
> Change-Id: I31c7c6a3b0ae6baaa7205b59cf1e6fff1bb2a517
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2412369
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Samuel Huang <huangs@chromium.org>
> Commit-Queue: Samuel Huang <huangs@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#807185}

TBR=huangs@chromium.org,agrieve@chromium.org

Change-Id: I13c23a145096865627c080910b4901ebff293901
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 999351
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2414648Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807490}
parent a6c88d89
...@@ -323,6 +323,15 @@ class _Session(object): ...@@ -323,6 +323,15 @@ class _Session(object):
tool_prefix = self._ToolPrefixForSymbol(size_info) tool_prefix = self._ToolPrefixForSymbol(size_info)
elf_path = self._ElfPathForSymbol(size_info, container, tool_prefix, elf_path = self._ElfPathForSymbol(size_info, container, tool_prefix,
elf_path) elf_path)
# Always use Android NDK's objdump because llvm-objdump does not seem to
# correctly disassemble.
output_directory_finder = self._output_directory_finder
if not output_directory_finder.Tentative():
output_directory_finder = path_util.OutputDirectoryFinder(
any_path_within_output_directory=elf_path)
tool_prefix = path_util.ToolPrefixFinder(
output_directory_finder=output_directory_finder,
linker_name='ld').Finalized()
args = [ args = [
path_util.GetObjDumpPath(tool_prefix), path_util.GetObjDumpPath(tool_prefix),
......
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