diff options
| author | Chris Robinson <[email protected]> | 2018-11-06 19:23:00 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-11-06 19:23:00 -0800 |
| commit | 9d4af941b9516a95190bbef2d15c1c13f31b5306 (patch) | |
| tree | f3da34b48ade5b7d7ec7f6b53b50bcaa8ea48e75 /.travis.yml | |
| parent | bf63c3d3d8224e2aea6177087e3436db6a046623 (diff) | |
Update Travis build images
GCC 4.x is too problematic with C++11. Ubuntu Xenial has GCC 5 which has more
complete C++11 conformance. For Android, NDK r16 includes libc++ as an
alternative to the deprecated GCC 4.9's libstdc++.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 426eef40..6c9bd78b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: c matrix: include: - os: linux - dist: trusty + dist: xenial - os: linux dist: trusty env: @@ -24,17 +24,17 @@ install: fi - > if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BUILD_ANDROID}" == "true" ]]; then - curl -o ~/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r15-linux-x86_64.zip + curl -o ~/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip unzip -q ~/android-ndk.zip -d ~ \ - 'android-ndk-r15/build/cmake/*' \ - 'android-ndk-r15/build/core/toolchains/arm-linux-androideabi-*/*' \ - 'android-ndk-r15/platforms/android-14/arch-arm/*' \ - 'android-ndk-r15/source.properties' \ - 'android-ndk-r15/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/*' \ - 'android-ndk-r15/sources/cxx-stl/gnu-libstdc++/4.9/include/*' \ - 'android-ndk-r15/sysroot/*' \ - 'android-ndk-r15/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/*' \ - 'android-ndk-r15/toolchains/llvm/prebuilt/linux-x86_64/*' + 'android-ndk-r16b/build/cmake/*' \ + 'android-ndk-r16b/build/core/toolchains/arm-linux-androideabi-*/*' \ + 'android-ndk-r16b/platforms/android-14/arch-arm/*' \ + 'android-ndk-r16b/source.properties' \ + 'android-ndk-r16b/sources/cxx-stl/llvm-libc++/4.9/libs/armeabi-v7a/*' \ + 'android-ndk-r16b/sources/cxx-stl/llvm-libc++/4.9/include/*' \ + 'android-ndk-r16b/sysroot/*' \ + 'android-ndk-r16b/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/*' \ + 'android-ndk-r16b/toolchains/llvm/prebuilt/linux-x86_64/*' fi script: - > @@ -51,7 +51,8 @@ script: - > if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BUILD_ANDROID}" == "true" ]]; then cmake \ - -DCMAKE_TOOLCHAIN_FILE=~/android-ndk-r15/build/cmake/android.toolchain.cmake \ + -DANDROID_STL=c++_shared \ + -DCMAKE_TOOLCHAIN_FILE=~/android-ndk-r16b/build/cmake/android.toolchain.cmake \ -DALSOFT_REQUIRE_OPENSL=ON \ -DALSOFT_EMBED_HRTF_DATA=YES \ . |