Consolidate android into single step

tmarkovski · tmarkovski · commit 4bbb8a1bc548 · 2021-10-19T17:07:49.000-04:00
diff --git a/.github/workflows/build-libs.yml b/.github/workflows/build-libs.yml
@@ -160,39 +160,15 @@ jobs:
           path: ./libs/ios/*
 
   build_android:
-    name: Android-arm
+    name: Android
     if: "! contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-        with:
-          submodules: "true"
+      - uses: actions/checkout@v1
 
-      - name: Run build script
-        run: ./devops/BuildLibraries.ps1 -Platform Android-ARM -OutLocation ./libs/android
+      - run: ./devops/BuildLibraries.ps1 -Platform Android -OutLocation ./libs/android
         shell: pwsh
-      - name: Upload Android artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: android-arm
-          path: ./libs/android/*
-
-  build_android_x86:
-    name: Android-x86
-    if: "! contains(github.event.head_commit.message, '[skip ci]')"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-        with:
-          submodules: "true"
-
-      - name: Run build script
-        run: ./devops/BuildLibraries.ps1 -Platform Android-x86 -OutLocation ./libs/android
-        shell: pwsh
-      - name: Upload Android artifact
-        uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v2
         with:
-          name: android-x86
-          path: ./libs/android/*
+          name: android
+          path: ./libs/android/*
diff --git a/devops/BuildLibraries.ps1 b/devops/BuildLibraries.ps1
@@ -91,15 +91,10 @@ try {
             Copy-Item -Path "./target/aarch64-apple-ios/release/libokapi.a" -Destination "$TargetOutput/libokapi.a"
             break
         }
-        Android-ARM {
+        Android {
             cargo install cargo-ndk
-            rustup target add aarch64-linux-android armv7-linux-androideabi
+            rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
             cargo ndk --target armv7-linux-androideabi --target aarch64-linux-android -o "$TargetOutput" build --release
-            break
-        }
-        Android-x86 {
-            cargo install cargo-ndk
-            rustup target add i686-linux-android x86_64-linux-android
             cargo ndk --target x86_64-linux-android --target i686-linux-android -o "$TargetOutput" build --release
             break
         }
