Merge "Revert "[scripts/symbol] Switch to clang-r416183d"" am: 7370ac9126 am: 00d0eaf23f

Original change: https://android-review.googlesource.com/c/platform/development/+/1736921

Change-Id: I961987880f617688417a0c00a82d67c76d525560
This commit is contained in:
Pirama Arumuga Nainar
2021-06-16 20:42:44 +00:00
committed by Automerger Merge Worker

View File

@@ -438,8 +438,8 @@ def CallCppFilt(mangled_symbol):
if not _CACHED_CXX_FILT:
toolchains = None
# TODO(b/187231324) do not hard-code prebuilt version number below
if os.path.exists('./clang-r416183d/bin/llvm-cxxfilt'):
toolchains = ["./clang-r416183d/bin/llvm-cxxfilt"]
if os.path.exists('./clang-r416183b/bin/llvm-cxxfilt'):
toolchains = ["./clang-r416183b/bin/llvm-cxxfilt"]
if not toolchains:
raise Exception("Could not find llvm-cxxfilt tool")
_CACHED_CXX_FILT = sorted(toolchains)[-1]