Skip to content

Commit 8ab4bf1

Browse files
committed
Fix android build jobs
1 parent b9857f5 commit 8ab4bf1

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ matrix:
9999
- shellcheck ci/*.sh
100100
allow_failures:
101101
# FIXME https://github.com/rust-lang/libc/issues/1170
102-
- name: "x86_64-linux-android - no assert_instr"
103102
- name: "arm-linux-androideabi - no assert_instr"
104103
- name: "aarch64-linux-android - no assert_instr"
105104
# clippy changes enough from time to time that it breaks relatively

ci/android-install-sdk.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ esac;
4747

4848
# --no_https avoids
4949
# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
50-
echo "yes" | \
51-
./sdk/tools/bin/sdkmanager --no_https \
52-
"emulator" \
53-
"platform-tools" \
54-
"platforms;android-24" \
55-
"system-images;android-24;default;$abi"
50+
yes | ./sdk/tools/bin/sdkmanager --licenses --no_https
51+
yes | ./sdk/tools/bin/sdkmanager --no_https \
52+
"emulator" \
53+
"platform-tools" \
54+
"platforms;android-24" \
55+
"system-images;android-24;default;$abi"
5656

5757
echo "no" |
5858
./sdk/tools/bin/avdmanager create avd \

0 commit comments

Comments
 (0)