Skip to content

Commit 2525a26

Browse files
trevjalberto lalama
trevj
authored and
alberto lalama
committed
Move to a prebuilt .so (#12)
* major restructuring, move to pre-built .so * work on marshmallow, update README
1 parent 4648afa commit 2525a26

File tree

979 files changed

+24
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

979 files changed

+24
-74
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@ Thumbs.db
99
*.log
1010
*.swp
1111
*.user
12+
13+
.gradle
14+
.idea
15+
.vscode
16+
android/obj

‎README.md

Lines changed: 4 additions & 0 deletions

‎android/java/build-extras.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dependencies {
2+
compile 'com.android.support:appcompat-v7:23.4.0'
3+
compile 'org.uproxy.jsocks:jsocks:1.0.1'
4+
}

‎src/android/org/uproxy/tun2socks/DnsResolverService.java renamed to ‎android/java/org/uproxy/tun2socks/DnsResolverService.java

File renamed without changes.

‎src/android/org/uproxy/tun2socks/Tun2Socks.java renamed to ‎android/java/org/uproxy/tun2socks/Tun2Socks.java

File renamed without changes.

‎src/android/org/uproxy/tun2socks/Tun2SocksJni.java renamed to ‎android/java/org/uproxy/tun2socks/Tun2SocksJni.java

File renamed without changes.

‎src/android/org/uproxy/tun2socks/Tunnel.java renamed to ‎android/java/org/uproxy/tun2socks/Tunnel.java

File renamed without changes.

‎src/android/org/uproxy/tun2socks/TunnelManager.java renamed to ‎android/java/org/uproxy/tun2socks/TunnelManager.java

File renamed without changes.

‎src/android/org/uproxy/tun2socks/TunnelState.java renamed to ‎android/java/org/uproxy/tun2socks/TunnelState.java

File renamed without changes.

‎src/android/org/uproxy/tun2socks/TunnelVpnService.java renamed to ‎android/java/org/uproxy/tun2socks/TunnelVpnService.java

File renamed without changes.

0 commit comments

Comments
 (0)