Skip to content

Commit

Permalink
addt'l feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
daniellacosse committed Oct 9, 2023
1 parent 38fd959 commit 9079f6e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ coverage
*.env
/build
/bin
intra/split/example/example

# General
.AppleDouble
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions src/tun2socks/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
File renamed without changes.

0 comments on commit 9079f6e

Please sign in to comment.