diff options
| author | gnzlbg <gonzalobg88@gmail.com> | 2019-01-21 19:54:17 +0100 |
|---|---|---|
| committer | gnzlbg <gonzalobg88@gmail.com> | 2019-01-21 20:34:43 +0100 |
| commit | 45adbf88dd16fdaa2d74ddc36db3ea06785ac6a5 (patch) | |
| tree | 6667e9748ad9e459be5edba7c62980c236a9a15d | |
| parent | 70284d78eebe89dcc941147bfb331a59c4fcc15b (diff) | |
| download | rust-libc-45adbf88dd16fdaa2d74ddc36db3ea06785ac6a5.tar.gz | |
Re-enables android build jobs
Closes #1170 .
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | ci/android-install-sdk.sh | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index da882aea61..6116475d2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,10 +88,6 @@ matrix: - shellcheck --version - shellcheck ci/*.sh - allow_failures: - - env: TARGET=aarch64-linux-android - - env: TARGET=x86_64-linux-android - install: rustup target add $TARGET script: - cargo generate-lockfile --manifest-path libc-test/Cargo.toml diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh index c0f63c9baa..6b5ac09ab0 100644 --- a/ci/android-install-sdk.sh +++ b/ci/android-install-sdk.sh @@ -46,9 +46,9 @@ case "$1" in esac; # --no_https avoids -# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found -echo "yes" | \ - ./sdk/tools/bin/sdkmanager --no_https \ + # javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found +yes | ./sdk/tools/bin/sdkmanager --licenses --no_https +yes | ./sdk/tools/bin/sdkmanager --no_https \ "emulator" \ "platform-tools" \ "platforms;android-24" \ |