Add Python 3 compatibility to Android symbol checker

Make the script that checks for undefined Android symbols compatible
with both Python 2 and Python 3, to allow for future updates to the
default system Python on our build machines.

I'd like to land this before https://github.com/servo/saltfs/pull/249.

We currently use Ubuntu 14.04 (an LTS release); Ubuntu is aiming for
Python 3 as the default Python in the next LTS release, 16.04, and
I'd like to have any scripts be ready for the transition.
This commit is contained in:
Aneesh Agrawal 2016-03-20 17:01:21 -04:00
parent aa35d7721b
commit b8eb19e566

View file

@ -11,15 +11,15 @@ import sys
import re
import subprocess
symbol_regex = re.compile("D \*UND\*\t(.*) (.*)$")
allowed_symbols = frozenset(['unshare', 'malloc_usable_size'])
symbol_regex = re.compile(b"D \*UND\*\t(.*) (.*)$")
allowed_symbols = frozenset([b'unshare', b'malloc_usable_size'])
actual_symbols = set()
objdump_output = subprocess.check_output([
'arm-linux-androideabi-objdump',
'-T',
'target/arm-linux-androideabi/debug/libservo.so']
).split('\n')
).split(b'\n')
for line in objdump_output:
m = symbol_regex.search(line)