Auto merge of #21275 - servo:jdm-patch-24, r=jdm

Use local android toolchain for dynamic symbol check.

Fixes https://github.com/servo/saltfs/issues/869 and unbreaks all of the android builds.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21275)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-07-27 20:04:39 -04:00 committed by GitHub
commit 5f0b7156cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -20,7 +20,7 @@ actual_symbols = set()
objdump_output = subprocess.check_output([
os.path.join(
os.environ['ANDROID_NDK'], 'toolchains', 'arm-linux-androideabi-4.9',
'android-toolchains', 'ndk', 'toolchains', 'arm-linux-androideabi-4.9',
'prebuilt', 'linux-x86_64', 'bin', 'arm-linux-androideabi-objdump'),
'-T',
'target/armv7-linux-androideabi/debug/libservo.so']