Skip to content
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.

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

Prepare for F-Droid #19

Merged
merged 3 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: git submodule update --init --recursive

- name: Set up Rust
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@1.83.0

- name: Install Rust targets
run: rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
Expand Down Expand Up @@ -67,3 +67,9 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: ${{ matrix.target_path }}

- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.build_type }}
path: ${{ matrix.target_path }}
1 change: 1 addition & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ cargo {
prebuiltToolchains = true
apiLevel = 24
targetIncludes = ['libovertls.so', 'libtun2proxy.so', 'libdns2socks.so']
extraCargoBuildArguments = ['--config', "build.rustflags = [ '--remap-path-prefix=${System.getenv('HOME')}/.cargo=.cargo', '--remap-path-prefix=${rootDir}=.', '-C', 'link-args=-Wl,--hash-style=gnu -Wl,--build-id=none' ]" ]
}

preBuild.dependsOn "cargoBuild"
Expand Down
3 changes: 3 additions & 0 deletions core/src/main/jni/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.10.2)

project("ssrDroid")

add_link_options("LINKER:--build-id=none" "LINKER:-hash-style=gnu")
add_compile_options("-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=ssrDroid")

add_subdirectory(re2)
include_directories(${LIB_RE2_DIR})
add_library( jni-helper SHARED jni-helper.cpp )
Expand Down
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
An Android client with OverTLS & SSRoT support, modified from Shadowsocks Android.
OverTLS is a new proxy which is basically SSRoT without SSR and SS, keeping only the Rust implementation of oT. It's very fast and stable.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/images/icon.png
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/short_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OverTLS & SSRoT Android client
5 changes: 5 additions & 0 deletions fastlane/metadata/android/zh-CN/full_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
由 Shadowsocks Android 客户端修改而来.

支持 OverTLS, 一個新代理,相当于是 SSRoT 去掉 SSR 和 SS, 唯独保留 oT 的 Rust 实现,快如闪电,稳如老狗。

支持 SSRoT 协议。
1 change: 1 addition & 0 deletions fastlane/metadata/android/zh-CN/short_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OverTLS & SSRoT Android 客户端
6 changes: 6 additions & 0 deletions mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ android {
enableV4Signing false
}
}
dependenciesInfo {
// Disables dependency metadata when building APKs.
includeInApk = false
// Disables dependency metadata when building Android App Bundles.
includeInBundle = false
}
buildFeatures {
viewBinding true
}
Expand Down
1 change: 0 additions & 1 deletion rust/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ build/
tmp/
dev/
target/
Cargo.lock
Loading
Loading