Skip to content

Commit f03e862

Browse files
madeyeclaude
authored andcommitted
Remove ABI splits in favor of AAB delivery
ABI splits are incompatible with AAB (bundleRelease fails with "Multiple shrunk-resources files found"). Since AAB already handles per-device ABI delivery, the splits block is redundant. Update release.sh to copy AAB outputs and fix APK paths in test/CI scripts. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent ae28fd9 commit f03e862

5 files changed

Lines changed: 5 additions & 16 deletions

File tree

.github/workflows/e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
env:
7171
SKIP_EMULATOR_BOOT: "true"
7272
ADB: adb
73-
APK: ${{ github.workspace }}/mobile/build/outputs/apk/debug/mobile-x86_64-debug.apk
73+
APK: ${{ github.workspace }}/mobile/build/outputs/apk/debug/mobile-debug.apk
7474
SSSERVER: ${{ github.workspace }}/core/src/main/rust/shadowsocks-rust/target/release/ssserver
7575

7676
- name: Upload screenshots

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ release/
1212
# release apks
1313
*.apk
1414
.DS_Store
15+
CLAUDE.md

buildSrc/src/main/kotlin/Helpers.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ fun Project.setupApp() {
9292
}
9393
lint.disable += "RemoveWorkManagerInitializer"
9494
packagingOptions.jniLibs.useLegacyPackaging = true
95-
splits.abi {
96-
isEnable = true
97-
isUniversalApk = true
98-
}
9995
}
10096

10197
dependencies.add("implementation", project(":core"))

release.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
#!/bin/bash
22

33
release=$1
4-
cp mobile/build/outputs/apk/release/mobile-armeabi-v7a-release.apk shadowsocks-armeabi-v7a-"${release}".apk
5-
cp mobile/build/outputs/apk/release/mobile-arm64-v8a-release.apk shadowsocks-arm64-v8a-"${release}".apk
6-
cp mobile/build/outputs/apk/release/mobile-x86-release.apk shadowsocks-x86-"${release}".apk
7-
cp mobile/build/outputs/apk/release/mobile-x86_64-release.apk shadowsocks-x86_64-"${release}".apk
8-
cp mobile/build/outputs/apk/release/mobile-universal-release.apk shadowsocks--universal-"${release}".apk
9-
cp tv/build/outputs/apk/freedom/release/tv-freedom-armeabi-v7a-release.apk shadowsocks-tv-armeabi-v7a-"${release}".apk
10-
cp tv/build/outputs/apk/freedom/release/tv-freedom-arm64-v8a-release.apk shadowsocks-tv-arm64-v8a-"${release}".apk
11-
cp tv/build/outputs/apk/freedom/release/tv-freedom-x86-release.apk shadowsocks-tv-x86-"${release}".apk
12-
cp tv/build/outputs/apk/freedom/release/tv-freedom-x86_64-release.apk shadowsocks-tv-x86_64-"${release}".apk
13-
cp tv/build/outputs/apk/freedom/release/tv-freedom-universal-release.apk shadowsocks-tv-universal-"${release}".apk
4+
cp mobile/build/outputs/bundle/release/mobile-release.aab shadowsocks-"${release}".aab
5+
cp tv/build/outputs/bundle/freedomRelease/tv-freedom-release.aab shadowsocks-tv-"${release}".aab

test-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
1313
EMULATOR="${EMULATOR:-/Volumes/Data/workspace/android/emulator/emulator}"
1414
ADB="${ADB:-/Volumes/Data/workspace/android/platform-tools/adb}"
1515
AVD="${AVD:-Medium_Phone_API_36.1}"
16-
APK="${APK:-$SCRIPT_DIR/mobile/build/outputs/apk/debug/mobile-arm64-v8a-debug.apk}"
16+
APK="${APK:-$SCRIPT_DIR/mobile/build/outputs/apk/debug/mobile-debug.apk}"
1717
SSSERVER="${SSSERVER:-$SCRIPT_DIR/core/src/main/rust/shadowsocks-rust/target/release/ssserver}"
1818
PKG="com.github.shadowsocks"
1919

0 commit comments

Comments
 (0)