From e7fd53b8099b6881e6af6199c6bec2abdc3ae22f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 3 Nov 2018 20:15:05 +0100 Subject: [PATCH] libwg-go: don't forget to include jni calls Signed-off-by: Jason A. Donenfeld --- app/build.gradle | 4 ++-- app/tools/libwg-go/Makefile | 2 +- app/tools/wireguard-go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 79a715f8..fb30d2a2 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 8d792412..b78db8b6 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 index 8be1fc9c..b8032760 160000 --- a/app/tools/wireguard-go +++ b/app/tools/wireguard-go @@ -1 +1 @@ -Subproject commit 8be1fc9c00407b85073ed66d95f12202df674ccb +Subproject commit b803276061b23076aa9dad8a5683973c0a51ac50