mirror of
https://github.com/outbackdingo/firezone.git
synced 2026-01-27 10:18:54 +00:00
Revert "chore(android): Remove i686 android target" (#3586)
Reverts firezone/firezone#3547 Seems that this wasn't the issue.
This commit is contained in:
2
.github/workflows/_kotlin.yml
vendored
2
.github/workflows/_kotlin.yml
vendored
@@ -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
|
||||
|
||||
2
.github/workflows/e2e.yml
vendored
2
.github/workflows/e2e.yml
vendored
@@ -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
|
||||
|
||||
@@ -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`.
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user