diff options
| -rw-r--r-- | tunnel/tools/libwg-go/Makefile | 3 | ||||
| -rw-r--r-- | ui/build.gradle | 10 | ||||
| -rw-r--r-- | ui/src/main/res/values/strings.xml | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile index 66470864..19e485cf 100644 --- a/tunnel/tools/libwg-go/Makefile +++ b/tunnel/tools/libwg-go/Makefile @@ -31,5 +31,6 @@ $(BUILDDIR)/go-$(DESIRED_GO_VERSION)/.prepared: touch "$@" $(DESTDIR)/libwg-go.so: export PATH := $(BUILDDIR)/go-$(DESIRED_GO_VERSION)/bin/:$(PATH) -$(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(DESIRED_GO_VERSION)/.prepared go.mod +$(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(DESIRED_GO_VERSION)/.prepared go.mod api-android.go +# go env 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 diff --git a/ui/build.gradle b/ui/build.gradle index 4a30a53a..d5c36d81 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -22,13 +22,21 @@ android { compileSdkVersion 29 dataBinding.enabled true defaultConfig { - applicationId 'com.wireguard.android' + applicationId 'eu.m7n.wireguard.android' minSdkVersion 21 targetSdkVersion 29 versionCode wireguardVersionCode versionName wireguardVersionName buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel" } + splits { + abi { + enable true + reset() + include "arm64-v8a", "x86_64" + universalApk false + } + } // If the keystore file exists if (keystorePropertiesFile.exists()) { // Initialize a new Properties() object called keystoreProperties. diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 6961c83a..7810f5a1 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -27,7 +27,7 @@ <string name="add_peer">Add peer</string> <string name="addresses">Addresses</string> <string name="allowed_ips">Allowed IPs</string> - <string name="app_name">WireGuard</string> + <string name="app_name">WireGuard (m7n.eu)</string> <string name="bad_config_context">%1$s\'s %2$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s in %2$s</string> |