diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2019-04-10 00:04:04 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2022-03-18 23:34:51 +0100 |
| commit | a04105032137325ba108f219e194ba64842ff9f2 (patch) | |
| tree | 1bd89bac8358d356d3f8af5140b65f81ece24ba2 | |
| parent | 575a8842b09a2ff7f70f37f3292d087ed946ea1d (diff) | |
m7n: local build modifications
| -rw-r--r-- | tunnel/tools/libwg-go/Makefile | 3 | ||||
| -rw-r--r-- | ui/build.gradle | 11 | ||||
| -rw-r--r-- | ui/src/main/res/values/strings.xml | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile index 1b5c60cf..034cef8e 100644 --- a/tunnel/tools/libwg-go/Makefile +++ b/tunnel/tools/libwg-go/Makefile @@ -46,7 +46,8 @@ $(BUILDDIR)/go-$(GO_VERSION)/.prepared: $(GRADLE_USER_HOME)/caches/golang/$(GO_T touch "$@"' $(DESTDIR)/libwg-go.so: export PATH := $(BUILDDIR)/go-$(GO_VERSION)/bin/:$(PATH) -$(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(GO_VERSION)/.prepared go.mod +$(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(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 .DELETE_ON_ERROR: diff --git a/ui/build.gradle b/ui/build.gradle index 2bbbe539..49bcc726 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -19,7 +19,7 @@ android { viewBinding = true } defaultConfig { - applicationId 'com.wireguard.android' + applicationId 'eu.m7n.wireguard.android' minSdkVersion 21 targetSdkVersion 30 versionCode wireguardVersionCode @@ -31,6 +31,15 @@ android { targetCompatibility JavaVersion.VERSION_1_8 coreLibraryDesugaringEnabled = true } + splits { + abi { + enable true + reset() + include "arm64-v8a", "x86_64" + universalApk false + } + } + // If the keystore file exists if (keystorePropertiesFile.exists()) { final def keystoreProperties = new Properties() keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 6c090199..e0f72fac 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -63,7 +63,7 @@ <string name="allow_remote_control_intents_summary_on">External apps may toggle tunnels (advanced)</string> <string name="allow_remote_control_intents_title">Allow remote control apps</string> <string name="allowed_ips">Allowed IPs</string> - <string name="app_name" translatable="false">WireGuard</string> + <string name="app_name" translatable="false">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> |