diff options
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/tools/libwg-go/Makefile | 2 | ||||
| -rw-r--r-- | app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go | 16 | ||||
| m--------- | app/tools/wireguard | 0 | ||||
| m--------- | app/tools/wireguard-go | 0 | ||||
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 3 |
7 files changed, 21 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle index 51ea31f2..f869f77c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ apply from: 'nonnull.gradle' final def keystorePropertiesFile = rootProject.file("keystore.properties") android { - buildToolsVersion '28.0.1' + buildToolsVersion '28.0.3' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/app/tools/libwg-go/Makefile b/app/tools/libwg-go/Makefile index f8db8738..86e6d571 100644 --- a/app/tools/libwg-go/Makefile +++ b/app/tools/libwg-go/Makefile @@ -2,7 +2,7 @@ # # Copyright © 2017-2018 WireGuard LLC. All Rights Reserved. -FILES := $(filter-out %/main.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) +FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) NDK_GO_ARCH_MAP_x86 := 386 NDK_GO_ARCH_MAP_x86_64 := amd64 diff --git a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go b/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go new file mode 100644 index 00000000..b31dcfa5 --- /dev/null +++ b/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved. + */ + +package main + +/* Reduce memory consumption for Android */ + +const ( + QueueOutboundSize = 1024 + QueueInboundSize = 1024 + QueueHandshakeSize = 1024 + MaxSegmentSize = 2200 + PreallocatedBuffersPerPool = 4096 +) diff --git a/app/tools/wireguard b/app/tools/wireguard -Subproject 393d8f2fcb61ed677dae9459c43858e37f1bd30 +Subproject 36c4f1047ed51d7dd4128ff4ceb837a56470646 diff --git a/app/tools/wireguard-go b/app/tools/wireguard-go -Subproject 15da869b31106d47823cb0a6cdd5c0ad3a0c243 +Subproject dbb72402f2f4f5c972be98ad0c9602eb74e9f13 diff --git a/build.gradle b/build.gradle index 9ae48b2e..68038e2a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ allprojects { buildscript { dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' } repositories { google() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2cfaf454..fb5b432f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Oct 01 15:59:48 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip |