Travis: Build several android architectures. (#137)

.travis.yml

@@ -32,10 +32,21 @@ matrix:
         - TARGET=aarch64-apple-ios
         - IOS=1
     # Android
-# Disabling until we have better proto support. See https://github.com/IronCoreLabs/ironoxide/pull/27
-#    - name: Android x64
-#      os: linux
-#      env:
-#        - TARGET=aarch64-linux-android
+    - name: Android arm64
+      os: linux
+      env:
+        - TARGET=aarch64-linux-android
+    - name: Android arm32
+      os: linux
+      env:
+        - TARGET=armv7-linux-androideabi
+    - name: Android for the emulator
+      os: linux
+      env:
+        - TARGET=i686-linux-android
+    - name: Android x86_64
+      os: linux
+      env:
+        - TARGET=x86_64-linux-android
 script:
   - "./.travis_scripts/cross-test.sh"

.travis_scripts/cross-test.sh

@@ -5,13 +5,13 @@ set -x
 
 # If no special target provided, use default cargo arch for building and run all unit tests
 if [ -z "$TARGET" ]; then
-    IRONCORE_ENV=dev cargo t --features "blocking beta" --verbose
+    IRONCORE_ENV=dev cargo test --features "blocking beta" --verbose
     cargo fmt -- --check
 # Cross doesn't have support for iOS builds, so use cargo to add the target and compile for it
 elif [ "$IOS" = 1 ]; then
     rustup target add "$TARGET"
     cargo build --features "blocking beta" --target "$TARGET"
 # For everything else, use cross to compile for the specified target
 else
-    cross build --features "blocking beta" --target "$TARGET"
-fi
+    cross build --no-default-features --features "blocking beta tls-vendored-openssl" --target "$TARGET"
+fi