Update ffi-builds.yml

livekit · Aug 26, 2024 · a7ccfc0 · a7ccfc0
1 parent 6816a32
commit a7ccfc0
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/.github/workflows/ffi-builds.yml b/.github/workflows/ffi-builds.yml
@@ -78,28 +78,27 @@ jobs:
             dylib: liblivekit_ffi.so
             target: aarch64-unknown-linux-gnu
             name: ffi-linux-arm64
-          ## android builds broke
-          # - os: ubuntu-20.04
-          #   platform: android
-          #   dylib: liblivekit_ffi.so
-          #   jar: libwebrtc.jar
-          #   target: aarch64-linux-android
-          #   name: ffi-android-arm64
-          #   buildargs: --no-default-features --features "rustls-tls-webpki-roots"
-          # - os: ubuntu-20.04
-          #   platform: android
-          #   dylib: liblivekit_ffi.so
-          #   jar: libwebrtc.jar
-          #   target: armv7-linux-androideabi
-          #   name: ffi-android-armv7
-          #   buildargs: --no-default-features --features "rustls-tls-webpki-roots"
-          # - os: ubuntu-20.04
-          #   platform: android
-          #   dylib: liblivekit_ffi.so
-          #   jar: libwebrtc.jar
-          #   target: x86_64-linux-android
-          #   name: ffi-android-x86_64
-          #   buildargs: --no-default-features --features "rustls-tls-webpki-roots"
+          - os: ubuntu-20.04
+            platform: android
+            dylib: liblivekit_ffi.so
+            jar: libwebrtc.jar
+            target: aarch64-linux-android
+            name: ffi-android-arm64
+            buildargs: --no-default-features --features "rustls-tls-webpki-roots"
+          - os: ubuntu-20.04
+            platform: android
+            dylib: liblivekit_ffi.so
+            jar: libwebrtc.jar
+            target: armv7-linux-androideabi
+            name: ffi-android-armv7
+            buildargs: --no-default-features --features "rustls-tls-webpki-roots"
+          - os: ubuntu-20.04
+            platform: android
+            dylib: liblivekit_ffi.so
+            jar: libwebrtc.jar
+            target: x86_64-linux-android
+            name: ffi-android-x86_64
+            buildargs: --no-default-features --features "rustls-tls-webpki-roots"
 
     name: Build (${{ matrix.target }})
     runs-on: ${{ matrix.os }}
@@ -155,6 +154,9 @@ jobs:
       # on android use cargo ndk
       - name: Build (Android)
         if: ${{ matrix.platform == 'android' }}
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r25c
         run: |
           cd livekit-ffi/
           cargo install cargo-ndk