commit 4a8096ef455458f067abdbd0f4c00c4a46a67619
author Logan Chien <loganchien@google.com> Thu Mar 21 01:29:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 21 01:29:09 2019 -0700
tree c847d445328ffe4dfa5bf2d4e5946651f8c65049
parent d97130751f5fa8fb6bcf222c78ad2dd7a66cc42e
parent d5050f82e4f5ace793136ae2d41bdf06b0ac1fb1

Merge "Update check_elf_file.py for clang-r353983" am: 81589605fd am: 5d00745b0a
am: d5050f82e4

Change-Id: I7ca40fac3d66b2918a0c0b2e808bf5362ceb93a7

tools/check_elf_file.py

diff --git a/tools/check_elf_file.py b/tools/check_elf_file.py
index 38c1cf4..de855c6 100755
--- a/tools/check_elf_file.py
+++ b/tools/check_elf_file.py
@@ -260,13 +260,20 @@
   _SYMBOL_ENTRY_END_PATTERN = '  }'
 
 
-  @classmethod
-  def _parse_symbol_name(cls, name_with_version):
+  @staticmethod
+  def _parse_symbol_name(name_with_version):
     """Split `name_with_version` into name and version. This function may split
     at last occurrence of `@@` or `@`."""
-    name, version = name_with_version.rsplit('@', 1)
-    if name and name[-1] == '@':
-      name = name[:-1]
+    pos = name_with_version.rfind('@')
+    if pos == -1:
+      name = name_with_version
+      version = ''
+    else:
+      if pos > 0 and name_with_version[pos - 1] == '@':
+        name = name_with_version[0:pos - 1]
+      else:
+        name = name_with_version[0:pos]
+      version = name_with_version[pos + 1:]
     return (name, version)