Skip to content

Commit defddeb

Browse files
committedAug 2, 2018
Use armv7- not arm-; drop mips support.
Per rust-lang/rust#33278, `armv7-android-linuxeabi` is preferred to `arm-android-linuxeabi`. Per https://developer.android.com/ndk/guides/abis: "Historically the NDK supported 32-bit and 64-bit MIPS, but support was removed in NDK r17."
1 parent 3d07b81 commit defddeb

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed
 

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ Cross compiles rust cargo projects for Android
77
To begin you must first install the rust toolchains for your target platforms.
88

99
```
10-
rustup target add arm-linux-androideabi # for arm
10+
rustup target add armv7-linux-androideabi # for arm
1111
rustup target add i686-linux-android # for x86
1212
...
1313
```
1414

1515
Next add the `cargo` configuration to android project. Point to your cargo project using `module` and add targets.
16-
Currently supported targets are `arm`, `arm64`, `mips`, and `x86`, `x86_64`.
16+
Currently supported targets are `arm`, `arm64` and `x86`, `x86_64`.
1717

1818
```
1919
cargo {
2020
module = "../rust"
21-
targets = ["arm", "x84"]
21+
targets = ["arm", "x86"]
2222
}
2323
2424
```

‎plugin/src/main/kotlin/com/nishtahir/RustAndroidPlugin.kt

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ val toolchains = listOf(
1616
"<ar>",
1717
"default"),
1818
Toolchain("arm",
19-
"arm-linux-androideabi",
19+
"armv7-linux-androideabi",
2020
"bin/arm-linux-androideabi-clang",
2121
"bin/arm-linux-androideabi-ar",
2222
"armeabi-v7a"),
@@ -25,11 +25,6 @@ val toolchains = listOf(
2525
"bin/aarch64-linux-android-clang",
2626
"bin/aarch64-linux-android-ar",
2727
"arm64-v8a"),
28-
Toolchain("mips",
29-
"mipsel-linux-android",
30-
"bin/mipsel-linux-android-clang",
31-
"bin/mipsel-linux-android-ar",
32-
"mips"),
3328
Toolchain("x86",
3429
"i686-linux-android",
3530
"bin/i686-linux-android-clang",

0 commit comments

Comments
 (0)
Please sign in to comment.