From bbab37f1e19bae4d143575ce22c4418c603cf39f Mon Sep 17 00:00:00 2001 From: Jamil Date: Sat, 3 Feb 2024 09:41:31 -0800 Subject: [PATCH] chore(android): Remove i686 android target (#3547) This increases our app bundle size with no real benefit. ~~I'm also encountering an issue where the `x86` shared library is being loaded instead of the appropriate x86_64 one, causing a crash.~~ Edit: The crash appears to be coming from somewhere else, still investigating. Still it would be good to remove this as the Rust dependency in the Android build is built serially. --- .github/workflows/_kotlin.yml | 2 +- .github/workflows/e2e.yml | 2 +- kotlin/android/README.md | 3 +-- kotlin/android/app/build.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml index ab5f6873d..65d2d116b 100644 --- a/.github/workflows/_kotlin.yml +++ b/.github/workflows/_kotlin.yml @@ -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 i686-linux-android + targets: armv7-linux-androideabi aarch64-linux-android x86_64-linux-android - uses: actions/setup-java@v4 with: distribution: temurin diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 754c6d27f..d08d811f5 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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 i686-linux-android + targets: armv7-linux-androideabi aarch64-linux-android x86_64-linux-android - uses: actions/setup-java@v4 with: distribution: oracle diff --git a/kotlin/android/README.md b/kotlin/android/README.md index ac80ccf02..4f5927be7 100644 --- a/kotlin/android/README.md +++ b/kotlin/android/README.md @@ -49,7 +49,6 @@ locally. aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi - i686-linux-android x86_64-linux-android ``` @@ -58,7 +57,7 @@ locally. `/rust/rust-toolchain.toml` file), then run: ``` - rustup target add aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi i686-linux-android x86_64-linux-android + rustup target add aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi x86_64-linux-android ``` 1. Perform a test build: `./gradlew assembleDebug`. diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index bd13cdfe0..682faf2b9 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -217,7 +217,7 @@ cargo { verbose = true module = "../../../rust/connlib/clients/android" libname = "connlib" - targets = listOf("arm", "arm64", "x86_64", "x86") + targets = listOf("arm", "arm64", "x86_64") targetDirectory = "../../../rust/target" }