Auto merge of #22277 - servo:android, r=jdm

Put every Android build artefact in target/android/

This works around #20380 at the cost of rebuilding build-only dependencies twice,
once for normal builds and once for 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/22277)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-11-28 07:02:12 -05:00 committed by GitHub
commit ae09fe490b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 51 additions and 47 deletions

View file

@ -23,7 +23,7 @@ objdump_output = subprocess.check_output([
'android-toolchains', 'ndk', 'toolchains', 'arm-linux-androideabi-4.9',
'prebuilt', 'linux-x86_64', 'bin', 'arm-linux-androideabi-objdump'),
'-T',
'target/armv7-linux-androideabi/debug/libsimpleservo.so']
'target/android/armv7-linux-androideabi/debug/libsimpleservo.so']
).split(b'\n')
for line in objdump_output: