diff options
| author | Chris Robinson <[email protected]> | 2020-04-17 23:21:04 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2020-04-17 23:21:04 -0700 |
| commit | cd87b9c66b8fc59017ff3a636346ca84b15b87c8 (patch) | |
| tree | 8a7a5d1293649ba8ffb5acb2a57a5e9562e25841 | |
| parent | 93e677edb32a1ff22c5cbf5496081a888fdbfd0a (diff) | |
Update Travis to use Android NDK r21, API 16
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 98b5adcc..c8704942 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,18 +24,18 @@ install: fi - > if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BUILD_ANDROID}" == "true" ]]; then - curl -o ~/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip + curl -o ~/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip unzip -q ~/android-ndk.zip -d ~ \ - '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/android/support/include/*' \ - 'android-ndk-r16b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/*' \ - 'android-ndk-r16b/sources/cxx-stl/llvm-libc++/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/*' + 'android-ndk-r21/build/cmake/*' \ + 'android-ndk-r21/build/core/toolchains/arm-linux-androideabi-*/*' \ + 'android-ndk-r21/platforms/android-16/arch-arm/*' \ + 'android-ndk-r21/source.properties' \ + 'android-ndk-r21/sources/android/support/include/*' \ + 'android-ndk-r21/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/*' \ + 'android-ndk-r21/sources/cxx-stl/llvm-libc++/include/*' \ + 'android-ndk-r21/sysroot/*' \ + 'android-ndk-r21/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/*' \ + 'android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/*' fi script: - > @@ -53,7 +53,7 @@ script: if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BUILD_ANDROID}" == "true" ]]; then cmake \ -DANDROID_STL=c++_shared \ - -DCMAKE_TOOLCHAIN_FILE=~/android-ndk-r16b/build/cmake/android.toolchain.cmake \ + -DCMAKE_TOOLCHAIN_FILE=~/android-ndk-r21/build/cmake/android.toolchain.cmake \ -DALSOFT_REQUIRE_OPENSL=ON \ -DALSOFT_EMBED_HRTF_DATA=YES \ . |