Skip to content

Remove ABI splits in favor of AAB delivery #3231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madeye wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove ABI splits in favor of AAB delivery #3231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
env:
SKIP_EMULATOR_BOOT: "true"
ADB: adb
APK: ${{ github.workspace }}/mobile/build/outputs/apk/debug/mobile-x86_64-debug.apk
APK: ${{ github.workspace }}/mobile/build/outputs/apk/debug/mobile-debug.apk
SSSERVER: ${{ github.workspace }}/core/src/main/rust/shadowsocks-rust/target/release/ssserver

- name: Upload screenshots
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ release/
# release apks
*.apk
.DS_Store
CLAUDE.md
4 changes: 0 additions & 4 deletions buildSrc/src/main/kotlin/Helpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ fun Project.setupApp() {
}
lint.disable += "RemoveWorkManagerInitializer"
packagingOptions.jniLibs.useLegacyPackaging = true
splits.abi {
isEnable = true
isUniversalApk = true
}
}

dependencies.add("implementation", project(":core"))
Expand Down
12 changes: 2 additions & 10 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
#!/bin/bash

release=$1
cp mobile/build/outputs/apk/release/mobile-armeabi-v7a-release.apk shadowsocks-armeabi-v7a-"${release}".apk
cp mobile/build/outputs/apk/release/mobile-arm64-v8a-release.apk shadowsocks-arm64-v8a-"${release}".apk
cp mobile/build/outputs/apk/release/mobile-x86-release.apk shadowsocks-x86-"${release}".apk
cp mobile/build/outputs/apk/release/mobile-x86_64-release.apk shadowsocks-x86_64-"${release}".apk
cp mobile/build/outputs/apk/release/mobile-universal-release.apk shadowsocks--universal-"${release}".apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-armeabi-v7a-release.apk shadowsocks-tv-armeabi-v7a-"${release}".apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-arm64-v8a-release.apk shadowsocks-tv-arm64-v8a-"${release}".apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-x86-release.apk shadowsocks-tv-x86-"${release}".apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-x86_64-release.apk shadowsocks-tv-x86_64-"${release}".apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-universal-release.apk shadowsocks-tv-universal-"${release}".apk
cp mobile/build/outputs/bundle/release/mobile-release.aab shadowsocks-"${release}".aab
cp tv/build/outputs/bundle/freedomRelease/tv-freedom-release.aab shadowsocks-tv-"${release}".aab
2 changes: 1 addition & 1 deletion test-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
EMULATOR="${EMULATOR:-/Volumes/Data/workspace/android/emulator/emulator}"
ADB="${ADB:-/Volumes/Data/workspace/android/platform-tools/adb}"
AVD="${AVD:-Medium_Phone_API_36.1}"
APK="${APK:-$SCRIPT_DIR/mobile/build/outputs/apk/debug/mobile-arm64-v8a-debug.apk}"
APK="${APK:-$SCRIPT_DIR/mobile/build/outputs/apk/debug/mobile-debug.apk}"
SSSERVER="${SSSERVER:-$SCRIPT_DIR/core/src/main/rust/shadowsocks-rust/target/release/ssserver}"
PKG="com.github.shadowsocks"

Expand Down