diff options
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index e0a64c84..b1e35913 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,6 @@ matrix: - BUILD_ANDROID=true - os: osx sudo: required -cache: - directories: - - $HOME/android-ndk-r14 install: - > if [[ "${TRAVIS_OS_NAME}" == "linux" && -z "${BUILD_ANDROID}" ]]; then @@ -27,18 +24,15 @@ install: fi - > if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BUILD_ANDROID}" == "true" ]]; then - if [[ ! -d ~/android-ndk-r14 || -z "$(ls -A ~/android-ndk-r14)" ]]; then - curl -o ~/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip - unzip -q ~/android-ndk.zip -d ~ \ - 'android-ndk-r14/build/cmake/*' \ - 'android-ndk-r14/platforms/android-9/arch-arm/*' \ - 'android-ndk-r14/source.properties' \ - 'android-ndk-r14/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/*' \ - 'android-ndk-r14/sysroot/*' \ - 'android-ndk-r14/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/*' \ - 'android-ndk-r14/toolchains/llvm/prebuilt/linux-x86_64/*' - sed -i -e 's/VERSION 3.6.0/VERSION 3.2/' ~/android-ndk-r14/build/cmake/android.toolchain.cmake - fi + curl -o ~/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip + unzip -q ~/android-ndk.zip -d ~ \ + 'android-ndk-r14/build/cmake/*' \ + 'android-ndk-r14/platforms/android-9/arch-arm/*' \ + 'android-ndk-r14/source.properties' \ + 'android-ndk-r14/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/*' \ + 'android-ndk-r14/sysroot/*' \ + 'android-ndk-r14/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/*' \ + 'android-ndk-r14/toolchains/llvm/prebuilt/linux-x86_64/*' fi script: - > |