Skip to content

Commit

Permalink
Add Python 3 compatibility to Android symbol checker
Browse files Browse the repository at this point in the history
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 servo/saltfs#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.
  • Loading branch information
aneeshusa committed Mar 20, 2016
1 parent aa35d77 commit b8eb19e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions etc/ci/check_dynamic_symbols.py
Expand Up @@ -11,15 +11,15 @@
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)
Expand Down

0 comments on commit b8eb19e

Please sign in to comment.