Revert "chore(android): Remove i686 android target" (#3586)

Reverts firezone/firezone#3547

Seems that this wasn't the issue.
This commit is contained in:
Jamil
2024-02-06 11:26:15 -08:00
committed by GitHub
parent 9ec4ca9000
commit 931dd972bd
4 changed files with 5 additions and 4 deletions

View File

@@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-rust
with:
targets: armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
targets: armv7-linux-androideabi aarch64-linux-android x86_64-linux-android i686-linux-android
- uses: actions/setup-java@v4
with:
distribution: temurin

View File

@@ -170,7 +170,7 @@ jobs:
- uses: ./.github/actions/setup-rust
with:
sccache_enabled: false
targets: armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
targets: armv7-linux-androideabi aarch64-linux-android x86_64-linux-android i686-linux-android
- uses: actions/setup-java@v4
with:
distribution: oracle

View File

@@ -49,6 +49,7 @@ locally.
aarch64-linux-android
arm-linux-androideabi
armv7-linux-androideabi
i686-linux-android
x86_64-linux-android
```
@@ -57,7 +58,7 @@ locally.
`/rust/rust-toolchain.toml` file), then run:
```
rustup target add aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi x86_64-linux-android
rustup target add aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi i686-linux-android x86_64-linux-android
```
1. Perform a test build: `./gradlew assembleDebug`.

View File

@@ -217,7 +217,7 @@ cargo {
verbose = true
module = "../../../rust/connlib/clients/android"
libname = "connlib"
targets = listOf("arm", "arm64", "x86_64")
targets = listOf("arm", "arm64", "x86_64", "x86")
targetDirectory = "../../../rust/target"
}