From 364032fe846128ce241e6fcc406fe583d05a2e9e Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 1 Oct 2018 16:02:55 +0200
Subject: Update gradle and external deps

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/build.gradle                                         |  2 +-
 app/tools/libwg-go/Makefile                              |  2 +-
 .../src/git.zx2c4.com/wireguard-go/queueconstants.go     | 16 ++++++++++++++++
 app/tools/wireguard                                      |  2 +-
 app/tools/wireguard-go                                   |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go

(limited to 'app')

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
index 393d8f2f..36c4f104 160000
--- a/app/tools/wireguard
+++ b/app/tools/wireguard
@@ -1 +1 @@
-Subproject commit 393d8f2fcb61ed677dae9459c43858e37f1bd30d
+Subproject commit 36c4f1047ed51d7dd4128ff4ceb837a56470646c
diff --git a/app/tools/wireguard-go b/app/tools/wireguard-go
index 15da869b..dbb72402 160000
--- a/app/tools/wireguard-go
+++ b/app/tools/wireguard-go
@@ -1 +1 @@
-Subproject commit 15da869b31106d47823cb0a6cdd5c0ad3a0c243b
+Subproject commit dbb72402f2f4f5c972be98ad0c9602eb74e9f133
-- 
cgit v1.2.3-59-g8ed1b