From 34de7f849799ea47534d617595ab566690a16f2f Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Thu, 4 Jun 2015 10:12:37 -0700 Subject: [PATCH] Strip version info when extracting symbols Bug: http://b/20139821 Change-Id: I1c1ed1b97a75936407e996698b98b94a7175ac30 (cherry picked from commit 6cda0742895e46aa4ad0e4e8d5637d166f9f46f2) --- libc/tools/check-symbols.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libc/tools/check-symbols.py b/libc/tools/check-symbols.py index 09225489d..a217ff725 100755 --- a/libc/tools/check-symbols.py +++ b/libc/tools/check-symbols.py @@ -41,10 +41,11 @@ def CheckSymbols(library, functions_or_variables): for line in subprocess.check_output(['readelf', '--dyn-syms', so_file]).split('\n'): m = r.match(line) if m: + symbol = string.split(m.group(2), '@')[0] if m.group(1) == 'FUNC' and functions_or_variables == 'functions': - actual_symbols.add(m.group(2)) + actual_symbols.add(symbol) elif m.group(1) == 'OBJECT' and functions_or_variables == 'variables': - actual_symbols.add(m.group(2)) + actual_symbols.add(symbol) #else: #print 'ignoring: ' % line