Commit dd6cd397 authored by Max Lv's avatar Max Lv

Fix #806 #804

parent a671ae98
Subproject commit 31cf00a881a9535d2e1282caf92542b9c31b0e7d Subproject commit 70f0438db89066e5ed9fdd78f6e99d40f4a76ab3
...@@ -55,12 +55,12 @@ go get -u github.com/xtaci/kcp-go ...@@ -55,12 +55,12 @@ go get -u github.com/xtaci/kcp-go
go get go get
echo "Cross compile kcptun for arm" echo "Cross compile kcptun for arm"
try env CGO_ENABLED=1 CC=$ANDROID_ARM_CC GOOS=android GOARCH=arm GOARM=7 go build try env CGO_ENABLED=1 CC=$ANDROID_ARM_CC GOOS=android GOARCH=arm GOARM=7 go build -ldflags="-s -w"
try $ANDROID_ARM_STRIP client try $ANDROID_ARM_STRIP client
try mv client $DIR/../src/main/assets/armeabi-v7a/kcptun try mv client $DIR/../src/main/assets/armeabi-v7a/kcptun
echo "Cross compile kcptun for x86" echo "Cross compile kcptun for x86"
try env CGO_ENABLED=1 CC=$ANDROID_X86_CC GOOS=android GOARCH=386 go build try env CGO_ENABLED=1 CC=$ANDROID_X86_CC GOOS=android GOARCH=386 go build -ldflags="-s -w"
try $ANDROID_X86_STRIP client try $ANDROID_X86_STRIP client
try mv client $DIR/../src/main/assets/x86/kcptun try mv client $DIR/../src/main/assets/x86/kcptun
popd popd
......
Subproject commit 8f72416f0f487adab36598678576ab288bfc4f84 Subproject commit d31210c21731ba9b055faccdc26c77b10773fe67
...@@ -122,7 +122,7 @@ class ShadowsocksNatService extends BaseService { ...@@ -122,7 +122,7 @@ class ShadowsocksNatService extends BaseService {
cmd += (getApplicationInfo.dataDir + "/kcptun" cmd += (getApplicationInfo.dataDir + "/kcptun"
, "-r", profile.host + ":" + profile.kcpPort , "-r", profile.host + ":" + profile.kcpPort
, "-l", "127.0.0.1:" + (profile.localPort + 90) , "-l", "127.0.0.1:" + (profile.localPort + 90)
, profile.kcpcli.trim) , profile.kcpcli.trim.replaceAll("[\"']", ""))
if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
......
...@@ -211,7 +211,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -211,7 +211,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
, "-r", profile.host + ":" + profile.kcpPort , "-r", profile.host + ":" + profile.kcpPort
, "-l", "127.0.0.1:" + (profile.localPort + 90) , "-l", "127.0.0.1:" + (profile.localPort + 90)
, "--path", getApplicationInfo.dataDir + "/protect_path" , "--path", getApplicationInfo.dataDir + "/protect_path"
, profile.kcpcli.trim) , profile.kcpcli.trim.replaceAll("[\"']", ""))
if (BuildConfig.DEBUG) if (BuildConfig.DEBUG)
Log.d(TAG, cmd.mkString(" ")) Log.d(TAG, cmd.mkString(" "))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment