From 758a77417355a22d3210493446d76cb429c1429b Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 10 Jul 2018 15:54:34 +0200 Subject: [PATCH] Travis CI: Add arm32-android configuration --- .travis.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3c017ff..75d7ddaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,9 @@ matrix: - os: linux env: ARCH=arm64-android RELEASE=NO sudo: required + - os: linux + env: ARCH=arm32-android RELEASE=NO + sudo: required - os: linux env: ARCH=html5 RELEASE=NO sudo: required @@ -45,11 +48,20 @@ before_install: export RAYLIB_PACKAGE_SUFFIX="-Android-arm64"; wget https://dl.google.com/android/repository/android-ndk-r17-linux-x86_64.zip; unzip -qq android-ndk*.zip; - android-ndk*/build/tools/make_standalone_toolchain.py --arch arm64 --api 21 --install-dir /tmp/android-toolchain; + if [[ "$ARCH" == arm64-* ]]; then + export RAYLIB_PACKAGE_SUFFIX="-Android-arm64"; + export TOOLCHAIN_ARCH=arm64; + export PREFIX=aarch64-linux-android-; + else + export RAYLIB_PACKAGE_SUFFIX="-Android-arm32"; + export TOOLCHAIN_ARCH=arm; + export PREFIX=arm-linux-androideabi-; + fi; + android-ndk*/build/tools/make_standalone_toolchain.py --arch $TOOLCHAIN_ARCH --api 21 --install-dir /tmp/android-toolchain; export PATH=/tmp/android-toolchain/bin:$PATH; + export CC=${PREFIX}clang; + export CXX=${PREFIX}clang++; export CMAKE_ARCH_ARGS='-DPLATFORM=Android'; - export CC=aarch64-linux-android-clang; - export CXX=aarch64-linux-android-clang++; elif [ "$ARCH" == "html5" ]; then export RAYLIB_PACKAGE_SUFFIX="-html5"; docker run --privileged=true -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash;