diff options
| author | Stewart Miles <smiles@google.com> | 2018-10-08 12:43:57 -0700 |
|---|---|---|
| committer | Wouter van Oortmerssen <aardappel@gmail.com> | 2018-10-08 12:43:57 -0700 |
| commit | 569492e8900e93a826381dd08e8ce419727c1f52 (patch) | |
| tree | bb97b11396a0e4bd591b40f55895929491cd6ced /.travis.yml | |
| parent | d840856093fa7b935b0d6378c436bd633d006c8c (diff) | |
| download | flatbuffers-569492e8900e93a826381dd08e8ce419727c1f52.tar.gz flatbuffers-569492e8900e93a826381dd08e8ce419727c1f52.tar.bz2 flatbuffers-569492e8900e93a826381dd08e8ce419727c1f52.zip | |
Disable armeabi builds for Android and re-enable CI builds. (#4970)
armeabi support was removed from the Android NDK so we should no
longer build it. Since this fixes the Android build failures this
commit also re-enables Travis Android builds.
While re-enabling Android builds, some recent changes broke C++98
support so this fixes those issues as well which include:
- Conditionally compiling use of move constructors, operators and
std::move.
- Changing sample to use flatbuffers::unique_ptr rather than
std::unique_ptr.
Finally, added the special "default_ptr_type" value for the
"cpp_ptr_type" attribute. This expands to the value passed to
the "--cpp-ptr-type" argument of flatc.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 331ea576..d056fd35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,26 +121,26 @@ matrix: osx_image: xcode9.3 env: CONAN_APPLE_CLANG_VERSIONS=9.1 - #- language: android - # sudo: true - # android: - # components: - # - tools - # - platform-tools - # - build-tools-25.0.2 - # - android-25 - # - extra-android-m2repository - # compiler: - # - gcc - # before_install: - # - git clone https://github.com/urho3d/android-ndk.git $HOME/android-ndk-root - # - export ANDROID_NDK_HOME=$HOME/android-ndk-root - # # Setup environment for Linux build which is required to build the sample. - # - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - # - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi - # - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq g++-$GCC_VERSION; fi - # - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq gcc-$GCC_VERSION; fi - # - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++; fi - # - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc; fi - # script: - # - failed=0; for build_gradle in $(git ls-files | grep build.gradle); do ( cd "$(dirname "${build_gradle}")" && ./gradlew build ) || failed=1; done; exit $((failed)) + - language: android + sudo: true + android: + components: + - tools + - platform-tools + - build-tools-25.0.2 + - android-25 + - extra-android-m2repository + compiler: + - gcc + before_install: + - git clone https://github.com/urho3d/android-ndk.git $HOME/android-ndk-root + - export ANDROID_NDK_HOME=$HOME/android-ndk-root + # Setup environment for Linux build which is required to build the sample. + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq g++-$GCC_VERSION; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq gcc-$GCC_VERSION; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc; fi + script: + - failed=0; for build_gradle in $(git ls-files | grep build.gradle); do ( cd "$(dirname "${build_gradle}")" && ./gradlew build ) || failed=1; done; exit $((failed)) |