Try to add 32-bit ARM support

emuCNmod · Mar 30, 2022 · 6c07028 · 6c07028
1 parent f6f1196
commit 6c07028
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Add Android target to Rust
-      run: rustup target add aarch64-linux-android
+      run: rustup target add aarch64-linux-android armv7-linux-androideabi
 
     # This is needed only because C++ stuff only works with NDK >= r24.
     # See: https://github.com/rust-windowing/android-ndk-rs/issues/255
@@ -44,6 +44,7 @@ jobs:
       run: |
         mkdir app/ruffle/src/main/jniLibs
         cp -r native/target/release/apk/lib/arm64-v8a app/ruffle/src/main/jniLibs/
+        cp -r native/target/release/apk/lib/armeabi-v7a app/ruffle/src/main/jniLibs/
 
     - name: Build APK
       run: |

diff --git a/app/ruffle/build.gradle b/app/ruffle/build.gradle
@@ -13,7 +13,7 @@ android {
         versionName "1.0"
 
         ndk {
-            abiFilters 'arm64-v8a'
+            abiFilters 'arm64-v8a', 'armeabi-v7a'
         }
     }
 

diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -35,6 +35,6 @@ ndk-context = "0.1.0"
 cpal = "0.13.5"
 
 [package.metadata.android]
-build_targets = [ "aarch64-linux-android"] # also "armv7-linux-androideabi"
+build_targets = [ "aarch64-linux-android", "armv7-linux-androideabi" ]
 target_sdk_version = 29
 min_sdk_version = 23
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ android { @@
             versionName "1.0"
             ndk {
-                abiFilters 'arm64-v8a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
         }
@@ Expand Down @@