Added 32bit flag

jazzdotdev · Nov 7, 2018 · efda6b7 · efda6b7
1 parent 44bbaff
commit efda6b7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ matrix:
         - zip ${PROJECT}-${TRAVIS_TAG}-${ARCH}-${PLATFORM}.zip ${PROJECT}
     - os: linux
       env: 
-        - ARCH=aarch64
+        - ARCH=arm64
         - PLATFORM=android
       script: echo "cargo test temporarily disabled"
       before_deploy:
@@ -32,16 +32,17 @@ matrix:
         - rm android-ndk-r18b-linux-x86_64.zip
         - export NDK_HOME="$PWD/android-ndk-r18b"
         - mkdir NDK
-        - ${NDK_HOME}/build/tools/make-standalone-toolchain.sh --arch=arm64 --install-dir=NDK/aarch64 --platform=android-26
+        - ${NDK_HOME}/build/tools/make-standalone-toolchain.sh --arch=arm64 --install-dir=NDK/aarch64 --platform=android-22
         - export PATH="$PATH:$PWD/NDK/aarch64/bin"
         - cargo build --target="aarch64-linux-android" --release
         - zip -j ${PROJECT}-${TRAVIS_TAG}-${ARCH}-${PLATFORM}.zip target/aarch64-linux-android/release/${PROJECT}
     # Reason we are doing a seperate build is to make sure a arch-base build is not bound to one specific platform
     # So if for whatever reason one job is canceled is failed, the next can continue. 
     - os: linux
       env: 
-        - ARCH=arm
+        - ARCH=arm32
         - PLATFORM=android
+        - NDK_BUILD_32BIT=1
       script: echo "cargo test temporarily disabled"
       before_deploy:
         - export PATH="$HOME/.cargo/bin:$PATH"
@@ -51,7 +52,7 @@ matrix:
         - rm android-ndk-r16b-linux-x86_64.zip
         - export NDK_HOME="$PWD/android-ndk-r16b"
         - mkdir NDK
-        - ${NDK_HOME}/build/tools/make-standalone-toolchain.sh --arch=arm --install-dir=NDK/arm --platform=android-26
+        - ${NDK_HOME}/build/tools/make-standalone-toolchain.sh --arch=arm --install-dir=NDK/arm --platform=android-22
         - export PATH="$PATH:$PWD/NDK/arm/bin" 	
         - cargo build --target="arm-linux-androideabi" --release
         - zip -j ${PROJECT}-${TRAVIS_TAG}-${ARCH}-${PLATFORM}.zip target/arm-linux-androideabi/release/${PROJECT}
@@ -74,7 +75,7 @@ deploy:
     tags: true
 branches:
   only:
-  - /^v\d+\.\d+\.\d+.*$/
+  - /^\d+\.\d+\.\d+.*$/
 notifications:
   email:
     on_success: never  
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/appveyor.yml b/appveyor.yml
@@ -61,4 +61,4 @@ deploy:
 branches:
   only:
     - master
-    - /^v\d+\.\d+\.\d+.*$/
+    - /^\d+\.\d+\.\d+.*$/