From de5783ab5a8bfa44937cd72970c3ae5b3639cfcd Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 16 May 2018 11:18:15 +0200 Subject: [PATCH 1/2] Use clang on travis with Android --- mk/update-travis-yml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 mk/update-travis-yml.py diff --git a/mk/update-travis-yml.py b/mk/update-travis-yml.py old mode 100644 new mode 100755 index 14eaec5783..6b168696a8 --- a/mk/update-travis-yml.py +++ b/mk/update-travis-yml.py @@ -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, From 7b26072bf9045671634ebdac12ceb6b21c44a56e Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Fri, 18 May 2018 14:12:01 +0200 Subject: [PATCH 2/2] Try upgrade the NDK version --- .travis.yml | 24 ++++++++++++------------ mk/travis-install-android.sh | 3 +-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6411e59377..eac7a9cc8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/mk/travis-install-android.sh b/mk/travis-install-android.sh index c914b9e9dd..86f4322626 100755 --- a/mk/travis-install-android.sh +++ b/mk/travis-install-android.sh @@ -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" @@ -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