diff --git a/.gitignore b/.gitignore index 6046ec290e..0061bc7815 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,6 @@ coverage *.env /build /bin -intra/split/example/example # General .AppleDouble diff --git a/go.mod b/go.mod index 8a7bfe2e96..8c1f7c7378 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Jigsaw-Code/choir v1.0.1 github.com/Jigsaw-Code/getsni v1.0.0 github.com/Jigsaw-Code/outline-sdk v0.0.7 - github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20230807220427-893de7fdc6b8 + github.com/Jigsaw-Code/outline-sdk/x v0.0.7 github.com/crazy-max/xgo v0.26.0 github.com/eycorsican/go-tun2socks v1.16.11 github.com/stretchr/testify v1.8.4 diff --git a/src/tun2socks/Makefile b/src/tun2socks/Makefile index ab28710707..eb42329eef 100644 --- a/src/tun2socks/Makefile +++ b/src/tun2socks/Makefile @@ -7,19 +7,13 @@ GOBIND=env PATH="$(GOBIN):$(PATH)" "$(GOMOBILE)" bind IMPORT_HOST=github.com IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-apps/outline/tun2socks -.PHONY: android apple linux windows intra clean clean-all +.PHONY: android apple linux windows clean clean-all -all: intra android linux apple windows +all: android linux apple windows # Don't strip Android debug symbols so we can upload them to crash reporting tools. ANDROID_BUILD_CMD=$(GOBIND) -a -ldflags '-w' -target=android -tags android -work -intra: $(BUILDDIR)/intra/tun2socks.aar - -$(BUILDDIR)/intra/tun2socks.aar: $(GOMOBILE) - mkdir -p "$(BUILDDIR)/intra" - $(ANDROID_BUILD_CMD) -o "$@" $(IMPORT_PATH)/intra $(IMPORT_PATH)/intra/android $(IMPORT_PATH)/intra/doh $(IMPORT_PATH)/intra/split $(IMPORT_PATH)/intra/protect - android: $(BUILDDIR)/android/tun2socks.aar $(BUILDDIR)/android/tun2socks.aar: $(GOMOBILE) diff --git a/src/tun2socks/tools.go b/tools.go similarity index 100% rename from src/tun2socks/tools.go rename to tools.go