Skip to content

Commit

Permalink
Merge pull request #19 from linsui/fdroid
Browse files Browse the repository at this point in the history
ssrlive authored Jan 10, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents a05b034 + cedc6f7 commit bb0ff8f
Showing 12 changed files with 3,084 additions and 2 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
@@ -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
@@ -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
@@ -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"
3 changes: 3 additions & 0 deletions core/src/main/jni/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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 )
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
@@ -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
}
1 change: 0 additions & 1 deletion rust/.gitignore
Original file line number Diff line number Diff line change
@@ -3,4 +3,3 @@ build/
tmp/
dev/
target/
Cargo.lock
3,055 changes: 3,055 additions & 0 deletions rust/Cargo.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions rust/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "1.83.0"

0 comments on commit bb0ff8f

Please sign in to comment.