Strip version info when extracting symbols
Bug: http://b/20139821
Change-Id: I1c1ed1b97a75936407e996698b98b94a7175ac30
(cherry picked from commit 6cda074289)
			
			
This commit is contained in:
		@@ -41,10 +41,11 @@ def CheckSymbols(library, functions_or_variables):
 | 
				
			|||||||
  for line in subprocess.check_output(['readelf', '--dyn-syms', so_file]).split('\n'):
 | 
					  for line in subprocess.check_output(['readelf', '--dyn-syms', so_file]).split('\n'):
 | 
				
			||||||
    m = r.match(line)
 | 
					    m = r.match(line)
 | 
				
			||||||
    if m:
 | 
					    if m:
 | 
				
			||||||
 | 
					      symbol = string.split(m.group(2), '@')[0]
 | 
				
			||||||
      if m.group(1) == 'FUNC' and functions_or_variables == 'functions':
 | 
					      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':
 | 
					      elif m.group(1) == 'OBJECT' and functions_or_variables == 'variables':
 | 
				
			||||||
        actual_symbols.add(m.group(2))
 | 
					        actual_symbols.add(symbol)
 | 
				
			||||||
    #else:
 | 
					    #else:
 | 
				
			||||||
      #print 'ignoring: ' % line
 | 
					      #print 'ignoring: ' % line
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user