aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-11-03 20:15:05 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-11-03 20:17:19 +0100
commit37bb827026f9d695a9a37d7e3b1768050a5522f9 (patch)
tree3d29157a039faabf1871b4afa9d0829c1043dbe8
parentBump version so that we have correct submodule hashes (diff)
downloadwireguard-android-37bb827026f9d695a9a37d7e3b1768050a5522f9.tar.xz
wireguard-android-37bb827026f9d695a9a37d7e3b1768050a5522f9.zip
libwg-go: don't forget to include jni calls0.0.20181103
-rw-r--r--app/build.gradle4
-rw-r--r--app/tools/libwg-go/Makefile2
m---------app/tools/wireguard-go0
3 files changed, 3 insertions, 3 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 79a715f..fb30d2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
applicationId 'com.wireguard.android'
minSdkVersion 21
targetSdkVersion 28
- versionCode 442
- versionName '0.0.20181031'
+ versionCode 443
+ versionName '0.0.20181103'
buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
}
// If the keystore file exists
diff --git a/app/tools/libwg-go/Makefile b/app/tools/libwg-go/Makefile
index 8d79241..b78db8b 100644
--- a/app/tools/libwg-go/Makefile
+++ b/app/tools/libwg-go/Makefile
@@ -3,7 +3,7 @@
# Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
UPSTREAM_FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) ../wireguard-go/go.mod ../wireguard-go/go.sum
-DOWNSTREAM_FILES := $(wildcard src/*.go) $(wildcard src/*/*.go)
+DOWNSTREAM_FILES := $(wildcard src/*.go) $(wildcard src/*.c) $(wildcard src/*/*.go)
BUILDDIR ?= $(CURDIR)/build
DESTDIR ?= $(CURDIR)/out
diff --git a/app/tools/wireguard-go b/app/tools/wireguard-go
-Subproject 8be1fc9c00407b85073ed66d95f12202df674cc
+Subproject b803276061b23076aa9dad8a5683973c0a51ac5