Switch to go mod

- Clash use latest dev branch to include UDP fixes - Add instructions on how to build this project Signed-off-by: Syrone Wong <[email protected]>
trojan-gfw · Feb 21, 2020 · e7499cd · e7499cd
1 parent bf91372
commit e7499cd
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 309 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/Makefile b/Makefile
@@ -5,6 +5,9 @@ SOURCES= \
 	github.com/trojan-gfw/igniter-go-libs/freeport \
 	github.com/trojan-gfw/igniter-go-libs/util
 
+# pass a single dollar sign to shell
+CURRENT_GOPATH="$(shell echo $$GOPATH)"
+
 all: ios android
 
 ios: clean
@@ -14,7 +17,11 @@ ios: clean
 
 android: clean
 	mkdir -p $(BUILDDIR)
-	gomobile bind -o $(BUILDDIR)/golibs.aar -a -v -ldflags '-s -w' -target=android $(SOURCES)
+	env GO111MODULE="on" gomobile bind -o $(BUILDDIR)/golibs.aar -a -v -x -ldflags '-s -w' -target=android  -gcflags=-trimpath="$(CURRENT_GOPATH)" $(SOURCES)
 
 clean:
+	gomobile clean
 	rm -rf $(BUILDDIR)
+
+cleanmodcache:
+	go clean -modcache