summaryrefslogtreecommitdiffhomepage
path: root/tunnel
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2021-12-17 21:50:14 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2022-03-18 22:05:31 +0100
commit815bbc7f7b20b2ad6622fc3e0ba9288ce9e8a5d0 (patch)
treecdcd1090eaa2073cb62d96a8c369f6c1ac63e5f4 /tunnel
parent8b075d5c1101d3245423063e865ccd4644e5080a (diff)
WIP try compile arm 32bitgvisor-transparent-proxy
Diffstat (limited to 'tunnel')
-rw-r--r--tunnel/build.gradle16
-rw-r--r--tunnel/tools/libwg-go/Makefile1
2 files changed, 9 insertions, 8 deletions
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index a9a3d305..09c9e9bd 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -49,14 +49,14 @@ android {
disable('NewApi') // Desugaring!
}
ndkVersion "21.3.6528147"
- splits {
- abi {
- enable true
- reset()
- include "arm64-v8a", "x86_64"
- universalApk false
- }
- }
+ // splits {
+ // abi {
+ // enable true
+ // reset()
+ // include "arm64-v8a", "armeabi-v7a"
+ // universalApk false
+ // }
+ // }
}
dependencies {
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile
index aa4a5c9e..be22bea5 100644
--- a/tunnel/tools/libwg-go/Makefile
+++ b/tunnel/tools/libwg-go/Makefile
@@ -72,6 +72,7 @@ gen/%_grpc.pb.go: $(PROTODIR)/%.proto $(BUILDDIR)/go-$(GO_VERSION)/.prepared $(P
$(DESTDIR)/libwg-go.so: export PATH := $(BUILDDIR)/go-$(GO_VERSION)/bin/:$(PATH)
$(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(GO_VERSION)/.prepared go.mod api-android.go http-proxy.go proxy.go service.go gen/libwg.pb.go gen/libwg_grpc.pb.go jni.c
+ echo "ARCH $(ANDROID_ARCH_NAME) $(GOARCH)"
go build -tags linux -ldflags="-X golang.zx2c4.com/wireguard/ipc.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -trimpath -o "$@" -buildmode c-shared
.DELETE_ON_ERROR: