try to support x86 and x86_64

This commit is contained in:
TÖRÖK Attila 2023-05-29 00:44:31 +02:00
parent 59baa97122
commit be5649d10a
3 changed files with 8 additions and 4 deletions

View File

@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
- name: Add Android target to Rust
run: rustup target add aarch64-linux-android armv7-linux-androideabi
run: rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
- name: Update Rust
run: rustup update
@ -50,6 +50,10 @@ jobs:
cp native/target/aarch64-linux-android/release/libruffle_android.so app/ruffle/src/main/jniLibs/arm64-v8a/
mkdir app/ruffle/src/main/jniLibs/armeabi-v7a
cp native/target/armv7-linux-androideabi/release/libruffle_android.so app/ruffle/src/main/jniLibs/armeabi-v7a/
mkdir app/ruffle/src/main/jniLibs/x86
cp native/target/i686-linux-android/release/libruffle_android.so app/ruffle/src/main/jniLibs/x86/
mkdir app/ruffle/src/main/jniLibs/x86_64
cp native/target/x86_64-linux-android/release/libruffle_android.so app/ruffle/src/main/jniLibs/x86_64/
- name: Build debug APK
run: |

View File

@ -16,7 +16,7 @@ android {
versionName "1.0"
ndk {
abiFilters 'arm64-v8a', 'armeabi-v7a'
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
}
}

View File

@ -27,11 +27,11 @@ ndk-context = "0.1.1"
# one of these sections might not be needed...
[package.metadata.android]
build_targets = [ "aarch64-linux-android", "armv7-linux-androideabi" ]
build_targets = [ "aarch64-linux-android", "armv7-linux-androideabi", "i686-linux-android", "x86_64-linux-android"]
target_sdk_version = 29
min_sdk_version = 26
[package.metadata.android.sdk]
build_targets = [ "aarch64-linux-android", "armv7-linux-androideabi" ]
build_targets = [ "aarch64-linux-android", "armv7-linux-androideabi", "i686-linux-android", "x86_64-linux-android"]
target_sdk_version = 29
min_sdk_version = 26