Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use clang on travis with Android #652

Merged
merged 2 commits into from
May 18, 2018
Merged

Use clang on travis with Android #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de5783a
Use clang on travis with Android
tomaka May 16, 2018
7b26072
Try upgrade the NDK version
tomaka May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ matrix:
os: osx
osx_image: xcode9.2

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: stable
os: linux
dist: trusty
Expand All @@ -50,7 +50,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X= MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X= MODE_X=DEBUG KCOV=0
rust: stable
os: linux
dist: trusty
Expand All @@ -63,7 +63,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: linux
dist: trusty
Expand All @@ -76,7 +76,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: linux
dist: trusty
Expand Down Expand Up @@ -545,7 +545,7 @@ matrix:
os: osx
osx_image: xcode9.2

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: nightly
os: linux
dist: trusty
Expand All @@ -558,7 +558,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X= MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X= MODE_X=DEBUG KCOV=0
rust: nightly
os: linux
dist: trusty
Expand All @@ -571,7 +571,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: linux
dist: trusty
Expand All @@ -584,7 +584,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: linux
dist: trusty
Expand Down Expand Up @@ -1073,7 +1073,7 @@ matrix:
os: osx
osx_image: xcode9.2

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: beta
os: linux
dist: trusty
Expand All @@ -1086,7 +1086,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X= MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X= MODE_X=DEBUG KCOV=0
rust: beta
os: linux
dist: trusty
Expand All @@ -1099,7 +1099,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: linux
dist: trusty
Expand All @@ -1112,7 +1112,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: linux
dist: trusty
Expand Down
3 changes: 1 addition & 2 deletions mk/travis-install-android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -ex
ANDROID_SDK_VERSION=${ANDROID_SDK_VERSION:-24.4.1}
ANDROID_SDK_URL=https://dl.google.com/android/android-sdk_r${ANDROID_SDK_VERSION}-linux.tgz

ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-14}
ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-17}
ANDROID_NDK_URL=https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip

ANDROID_INSTALL_PREFIX="${HOME}/android"
Expand Down Expand Up @@ -59,7 +59,6 @@ if [[ ! -d $ANDROID_NDK_INSTALL_DIR/sysroot/usr/include/arm-linux-androideabi ]]
--force \
--arch arm \
--api 18 \
--unified-headers \
--install-dir ${ANDROID_NDK_INSTALL_DIR}

popd
Expand Down
2 changes: 1 addition & 1 deletion mk/update-travis-yml.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

compilers = {
"aarch64-unknown-linux-gnu" : [ "aarch64-linux-gnu-gcc" ],
"armv7-linux-androideabi" : [ "arm-linux-androideabi-gcc" ],
"armv7-linux-androideabi" : [ "arm-linux-androideabi-clang" ],
"arm-unknown-linux-gnueabihf" : [ "arm-linux-gnueabihf-gcc" ],
"i686-unknown-linux-gnu" : linux_compilers,
"x86_64-unknown-linux-gnu" : linux_compilers,
Expand Down