diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf87e135d..257855174 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: java-version: 21 - name: Install Rust Toolchain - run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy + run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy - name: Rust Cache uses: Swatinem/rust-cache@v2 @@ -64,7 +64,7 @@ jobs: run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11718014" - name: Install Rust Toolchain - run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy + run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy - name: Rust Cache uses: Swatinem/rust-cache@v2 @@ -107,12 +107,6 @@ jobs: name: default-armeabi-v7a-${{ github.sha }} path: app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk - - name: Upload x86 - uses: actions/upload-artifact@v4 - with: - name: default-x86-${{ github.sha }} - path: app/build/outputs/apk/default/release/app-default-x86-release.apk - - name: Upload mapping uses: actions/upload-artifact@v4 with: @@ -141,7 +135,7 @@ jobs: run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11718014" - name: Install Rust Toolchain - run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy + run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy - name: Rust Cache uses: Swatinem/rust-cache@v2 @@ -184,12 +178,6 @@ jobs: name: marshmallow-armeabi-v7a-${{ github.sha }} path: app/build/outputs/apk/marshmallow/release/app-marshmallow-armeabi-v7a-release.apk - - name: Upload x86 - uses: actions/upload-artifact@v4 - with: - name: marshmallow-x86-${{ github.sha }} - path: app/build/outputs/apk/marshmallow/release/app-marshmallow-x86-release.apk - - name: Upload mapping uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 0775233f0..4a0c5754b 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -22,7 +22,7 @@ jobs: run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11718014" - name: Install Rust Toolchain - run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android + run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android - name: Rust Cache uses: Swatinem/rust-cache@v2 @@ -46,7 +46,6 @@ jobs: mv app/build/outputs/apk/default/release/app-default-universal-release.apk EhViewer-${{ github.ref_name }}-default-universal.apk mv app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-default-arm64-v8a.apk mv app/build/outputs/apk/default/release/app-default-x86_64-release.apk EhViewer-${{ github.ref_name }}-default-x86_64.apk - mv app/build/outputs/apk/default/release/app-default-x86-release.apk EhViewer-${{ github.ref_name }}-default-x86.apk mv app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-default-armeabi-v7a.apk mv app/build/outputs/mapping/defaultRelease/mapping.txt EhViewer-${{ github.ref_name }}-default-mapping.txt mv app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-default-native-debug-symbols.zip @@ -54,7 +53,6 @@ jobs: mv app/build/outputs/apk/marshmallow/release/app-marshmallow-universal-release.apk EhViewer-${{ github.ref_name }}-marshmallow-universal.apk mv app/build/outputs/apk/marshmallow/release/app-marshmallow-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-arm64-v8a.apk mv app/build/outputs/apk/marshmallow/release/app-marshmallow-x86_64-release.apk EhViewer-${{ github.ref_name }}-marshmallow-x86_64.apk - mv app/build/outputs/apk/marshmallow/release/app-marshmallow-x86-release.apk EhViewer-${{ github.ref_name }}-marshmallow-x86.apk mv app/build/outputs/apk/marshmallow/release/app-marshmallow-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-armeabi-v7a.apk mv app/build/outputs/mapping/marshmallowRelease/mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-mapping.txt mv app/build/outputs/native-debug-symbols/marshmallowRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-marshmallow-native-debug-symbols.zip @@ -67,7 +65,6 @@ jobs: EhViewer-${{ github.ref_name }}-default-universal.apk EhViewer-${{ github.ref_name }}-default-arm64-v8a.apk EhViewer-${{ github.ref_name }}-default-x86_64.apk - EhViewer-${{ github.ref_name }}-default-x86.apk EhViewer-${{ github.ref_name }}-default-armeabi-v7a.apk EhViewer-${{ github.ref_name }}-default-mapping.txt EhViewer-${{ github.ref_name }}-default-native-debug-symbols.zip @@ -75,7 +72,6 @@ jobs: EhViewer-${{ github.ref_name }}-marshmallow-universal.apk EhViewer-${{ github.ref_name }}-marshmallow-arm64-v8a.apk EhViewer-${{ github.ref_name }}-marshmallow-x86_64.apk - EhViewer-${{ github.ref_name }}-marshmallow-x86.apk EhViewer-${{ github.ref_name }}-marshmallow-armeabi-v7a.apk EhViewer-${{ github.ref_name }}-marshmallow-mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-native-debug-symbols.zip diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d8a91d3f8..0cb80f772 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,7 +28,7 @@ android { isEnable = true reset() if (isRelease) { - include("arm64-v8a", "x86_64", "armeabi-v7a", "x86") + include("arm64-v8a", "x86_64", "armeabi-v7a") isUniversalApk = true } else { include("arm64-v8a", "x86_64") diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt index 1e6f4ce75..2431930c1 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt @@ -33,7 +33,7 @@ object AppConfig { private const val CRASH = "crash" private val abi = Build.SUPPORTED_ABIS[0].takeIf { - it in setOf("arm64-v8a", "x86_64", "armeabi-v7a", "x86") + it in setOf("arm64-v8a", "x86_64", "armeabi-v7a") } ?: "universal" fun matchVariant(name: String) = name.contains(BuildConfig.FLAVOR) && name.contains(abi)