Browse Source

Update gradle and external deps

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
master
Jason A. Donenfeld 6 years ago
parent
commit
364032fe84
7 changed files with 23 additions and 6 deletions
  1. +1
    -1
      app/build.gradle
  2. +1
    -1
      app/tools/libwg-go/Makefile
  3. +16
    -0
      app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go
  4. +1
    -1
      app/tools/wireguard
  5. +1
    -1
      app/tools/wireguard-go
  6. +1
    -1
      build.gradle
  7. +2
    -1
      gradle/wrapper/gradle-wrapper.properties

+ 1
- 1
app/build.gradle View File

@@ -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


+ 1
- 1
app/tools/libwg-go/Makefile View File

@@ -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


+ 16
- 0
app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go View File

@@ -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
)

+ 1
- 1
app/tools/wireguard

@@ -1 +1 @@
Subproject commit 393d8f2fcb61ed677dae9459c43858e37f1bd30d
Subproject commit 36c4f1047ed51d7dd4128ff4ceb837a56470646c

+ 1
- 1
app/tools/wireguard-go

@@ -1 +1 @@
Subproject commit 15da869b31106d47823cb0a6cdd5c0ad3a0c243b
Subproject commit dbb72402f2f4f5c972be98ad0c9602eb74e9f133

+ 1
- 1
build.gradle View File

@@ -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()


+ 2
- 1
gradle/wrapper/gradle-wrapper.properties View File

@@ -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

Loading…
Cancel
Save