OpenE2K/libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #1224 - gnzlbg:fix_android, r=gnzlbg

Browse Source 
Re-enable android build jobs

This performs a `yes | ./sdk/tools/bin/sdkmanager --licenses` - the sole purpose of the `--licenses` flag is to allow the user to accept all licenses a priori, so that all other commands don't show any licenses.

For some reason, after all licenses have been accepted, the install step says that some licenses are still not accepted... so we need to accept those too... Why? I have no idea, and accepting licenses while installing still appears to make things hang a little, but it only does so for one non-accepted license, instead of for 5-6 like before, so now things do work.
This commit is contained in:
bors 2019-01-21 21:05:07 +00:00
commit fb2b3dac03
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -89,8 +89,9 @@ matrix:
- shellcheck ci/*.sh - shellcheck ci/*.sh
allow_failures: allow_failures:
- env: TARGET=aarch64-linux-android # FIXME: https://github.com/rust-lang/libc/issues/1226
- env: TARGET=x86_64-linux-android - env: TARGET=asmjs-unknown-emscripten
- env: TARGET=wasm32-unknown-emscripten
install: rustup target add $TARGET install: rustup target add $TARGET
script: script:

4
ci/android-install-sdk.sh
View File

@ -47,8 +47,8 @@ esac;
# --no_https avoids # --no_https avoids
# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found # javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
echo "yes" | \ yes | ./sdk/tools/bin/sdkmanager --licenses --no_https
./sdk/tools/bin/sdkmanager --no_https \ yes | ./sdk/tools/bin/sdkmanager --no_https \
"emulator" \ "emulator" \
"platform-tools" \ "platform-tools" \
"platforms;android-24" \ "platforms;android-24" \

2
libc-test/build.rs
View File

@ -658,7 +658,7 @@ fn main() {
// MFD_HUGETLB is not available in some older libc versions on the CI builders. On the // MFD_HUGETLB is not available in some older libc versions on the CI builders. On the
// x86_64 and i686 builders it seems to be available for all targets, so at least test // x86_64 and i686 builders it seems to be available for all targets, so at least test
// it there. // it there.
"MFD_HUGETLB" if !(x86_64 || i686) || musl => true, "MFD_HUGETLB" if !(x86_64 || i686) || musl || (x86_64 && android)=> true,
"DT_FIFO" | "DT_CHR" | "DT_DIR" | "DT_BLK" | "DT_REG" "DT_FIFO" | "DT_CHR" | "DT_DIR" | "DT_BLK" | "DT_REG"
| "DT_LNK" | "DT_SOCK" | "DT_LNK" | "DT_SOCK"