Преглед на файлове

Travis CI: Add arm32-android configuration

Ahmad Fatoum преди 7 години
родител
ревизия
758a774173
променени са 1 файла, в които са добавени 15 реда и са изтрити 3 реда
  1. 15 3
      .travis.yml

+ 15 - 3
.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;