diff --git a/AndroidLibV2rayLite/Makefile b/AndroidLibV2rayLite/Makefile index f4a4ec68..a4431493 100644 --- a/AndroidLibV2rayLite/Makefile +++ b/AndroidLibV2rayLite/Makefile @@ -8,9 +8,6 @@ asset: # cd assets;curl https://raw.githubusercontent.com/2dust/AndroidLibV2rayLite/master/data/geosite.dat > geosite.dat # cd assets;curl https://raw.githubusercontent.com/2dust/AndroidLibV2rayLite/master/data/geoip.dat > geoip.dat -shippedBinary: - cd shippedBinarys; $(MAKE) shippedBinary - fetchDep: -go get github.com/2dust/AndroidLibV2rayLite go get github.com/2dust/AndroidLibV2rayLite @@ -30,5 +27,5 @@ downloadGoMobile: BuildMobile: @echo Stub -all: asset pb shippedBinary fetchDep +all: asset pb fetchDep @echo DONE diff --git a/AndroidLibV2rayLite/compile-tun2socks.sh b/AndroidLibV2rayLite/compile-tun2socks.sh index ef0fdbe6..cd09cefa 100644 --- a/AndroidLibV2rayLite/compile-tun2socks.sh +++ b/AndroidLibV2rayLite/compile-tun2socks.sh @@ -34,14 +34,10 @@ $NDK_HOME/ndk-build \ NDK_OUT=$TMPDIR/tmp \ APP_SHORT_COMMANDS=false LOCAL_SHORT_COMMANDS=false -B -j4 -install -v -m755 libs/armeabi-v7a/tun2socks $__dir/shippedBinarys/ArchDep/arm/ -install -v -m755 libs/arm64-v8a/tun2socks $__dir/shippedBinarys/ArchDep/arm64/ -install -v -m755 libs/x86/tun2socks $__dir/shippedBinarys/ArchDep/386/ -install -v -m755 libs/x86_64/tun2socks $__dir/shippedBinarys/ArchDep/amd64/ +install -v -m755 libs/armeabi-v7a/tun2socks $__dir/../V2rayNG/app/src/main/jniLibs/armeabi-v7a/libtun2socks.so +install -v -m755 libs/arm64-v8a/tun2socks $__dir/../V2rayNG/app/src/main/jniLibs/arm64-v8a/libtun2socks.so +install -v -m755 libs/x86/tun2socks $__dir/../V2rayNG/app/src/main/jniLibs/x86/libtun2socks.so +install -v -m755 libs/x86_64/tun2socks $__dir/../V2rayNG/app/src/main/jniLibs/x86_64/libtun2socks.so popd -pushd $__dir/shippedBinarys -make clean && make shippedBinary -popd - -rm -rf $TMPDIR \ No newline at end of file +rm -rf $TMPDIR diff --git a/AndroidLibV2rayLite/interact.go b/AndroidLibV2rayLite/interact.go index 91b2acf7..57b45289 100644 --- a/AndroidLibV2rayLite/interact.go +++ b/AndroidLibV2rayLite/interact.go @@ -11,7 +11,6 @@ import ( "github.com/2dust/AndroidLibV2rayLite/CoreI" "github.com/2dust/AndroidLibV2rayLite/Process/Escort" "github.com/2dust/AndroidLibV2rayLite/VPN" - "github.com/2dust/AndroidLibV2rayLite/shippedBinarys" mobasset "golang.org/x/mobile/asset" v2core "v2ray.com/core" @@ -227,12 +226,6 @@ func NewV2RayPoint(s V2RayVPNServiceSupportsSet) *V2RayPoint { } func (v V2RayPoint) runTun2socks() error { - shipb := shippedBinarys.FirstRun{Status: v.status} - if err := shipb.CheckAndExport(); err != nil { - log.Println(err) - return err - } - v.escorter.EscortingUp() go v.escorter.EscortRun( v.status.GetApp("libtun2socks.so"), diff --git a/AndroidLibV2rayLite/shippedBinarys/ArchDep/386/tun2socks b/AndroidLibV2rayLite/shippedBinarys/ArchDep/386/tun2socks deleted file mode 100644 index f5c05b58..00000000 Binary files a/AndroidLibV2rayLite/shippedBinarys/ArchDep/386/tun2socks and /dev/null differ diff --git a/AndroidLibV2rayLite/shippedBinarys/ArchDep/amd64/tun2socks b/AndroidLibV2rayLite/shippedBinarys/ArchDep/amd64/tun2socks deleted file mode 100644 index 8f426499..00000000 Binary files a/AndroidLibV2rayLite/shippedBinarys/ArchDep/amd64/tun2socks and /dev/null differ diff --git a/AndroidLibV2rayLite/shippedBinarys/ArchDep/arm/tun2socks b/AndroidLibV2rayLite/shippedBinarys/ArchDep/arm/tun2socks deleted file mode 100644 index b1aa74e3..00000000 Binary files a/AndroidLibV2rayLite/shippedBinarys/ArchDep/arm/tun2socks and /dev/null differ diff --git a/AndroidLibV2rayLite/shippedBinarys/ArchDep/arm64/tun2socks b/AndroidLibV2rayLite/shippedBinarys/ArchDep/arm64/tun2socks deleted file mode 100644 index b46649ef..00000000 Binary files a/AndroidLibV2rayLite/shippedBinarys/ArchDep/arm64/tun2socks and /dev/null differ diff --git a/AndroidLibV2rayLite/shippedBinarys/ArchIndep/holder b/AndroidLibV2rayLite/shippedBinarys/ArchIndep/holder deleted file mode 100644 index e69de29b..00000000 diff --git a/AndroidLibV2rayLite/shippedBinarys/Makefile b/AndroidLibV2rayLite/shippedBinarys/Makefile deleted file mode 100644 index f9c450e0..00000000 --- a/AndroidLibV2rayLite/shippedBinarys/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -Platdep=shippedBinary.386 shippedBinary.amd64 shippedBinary.arm64 shippedBinary.arm - -shippedBinaryDep: - go get -u github.com/jteeuwen/go-bindata/... - -shippedBinary.%: - go-bindata -nometadata -nomemcopy -pkg shippedBinarys -o ./binary_$*.go -tags $* ArchIndep/ ArchDep/$*/ - -shippedBinary:shippedBinaryDep $(Platdep) - @echo "Done" - -clean: - -rm binary* diff --git a/AndroidLibV2rayLite/shippedBinarys/firstrun.go b/AndroidLibV2rayLite/shippedBinarys/firstrun.go deleted file mode 100644 index fcbd8c7c..00000000 --- a/AndroidLibV2rayLite/shippedBinarys/firstrun.go +++ /dev/null @@ -1,69 +0,0 @@ -package shippedBinarys - -import ( - "log" - "os" - "strconv" - - "github.com/2dust/AndroidLibV2rayLite/CoreI" -) - -type FirstRun struct { - Status *CoreI.Status -} - -func (v *FirstRun) checkIfRcExist() error { - datadir := v.Status.GetDataDir() - if _, err := os.Stat(datadir + strconv.Itoa(CoreI.CheckVersion())); !os.IsNotExist(err) { - log.Println("file exists") - return nil - } - - - IndepDir, err := AssetDir("ArchIndep") - log.Println(IndepDir) - if err != nil { - return err - } - for _, fn := range IndepDir { - log.Println(datadir+"ArchIndep/"+fn) - - err := RestoreAsset(datadir, "ArchIndep/"+fn) - log.Println(err) - - //GrantPremission - os.Chmod(datadir+"ArchIndep/"+fn, 0700) - log.Println(os.Remove(datadir + fn)) - log.Println(os.Symlink(datadir+"ArchIndep/"+fn, datadir + fn)) - } - - - DepDir, err := AssetDir("ArchDep") - log.Println(DepDir) - if err != nil { - return err - } - for _, fn := range DepDir { - DepDir2, err := AssetDir("ArchDep/" + fn) - log.Println("ArchDep/" + fn) - if err != nil { - return err - } - for _, FND := range DepDir2 { - log.Println(datadir+"ArchDep/"+fn+"/"+FND) - - RestoreAsset(datadir, "ArchDep/"+fn+"/"+FND) - os.Chmod(datadir+"ArchDep/"+fn+"/"+FND, 0700) - log.Println(os.Remove(datadir + FND)) - log.Println(os.Symlink(datadir+"ArchDep/"+fn+"/"+FND, datadir+FND)) - } - } - s, _ := os.Create(datadir + strconv.Itoa(CoreI.CheckVersion())) - s.Close() - - return nil -} - -func (v *FirstRun) CheckAndExport() error { - return v.checkIfRcExist() -}