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

Test Android x86 on CI

Fixes https://github.com/servo/servo/issues/21124

<!-- 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/21166)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-07-12 16:47:26 -04:00 committed by GitHub
commit 8af9409339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 5 deletions

View file

@ -0,0 +1,17 @@
#!/usr/bin/env bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
set -o errexit
set -o nounset
set -o pipefail
# We enable pipefail above to satisfy servo-tidy, but disable it again here.
# In the case of the 'yes' program,
# exiting when the stdout pipe is broken is expected.
set +o pipefail
cd $(dirname ${0})/../..
yes | ./mach bootstrap-android

View file

@ -160,7 +160,13 @@ android:
- python ./etc/ci/check_dynamic_symbols.py
android-x86:
- echo FIXME To be filled in once Buildbot is configured
- ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force
- ./etc/ci/bootstrap-android-and-accept-licences.sh
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --target i686-linux-android --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach package --target i686-linux-android --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-android-startup --release
- bash ./etc/ci/lockfile_changed.sh
android-nightly:
- ./mach clean-nightlies --keep 3 --force

View file

@ -58,10 +58,7 @@ class MachCommands(CommandBase):
@Command('bootstrap-android',
description='Install the Android SDK and NDK.',
category='bootstrap')
@CommandArgument('--update',
action='store_true',
help='Run SDK component install and emulator image creation again')
def bootstrap_android(self, update=False):
def bootstrap_android(self):
ndk = "android-ndk-r12b-{system}-{arch}"
tools = "sdk-tools-{system}-4333796"