libwg-go: don't forget to include jni calls

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 441
-        versionName '0.0.20181001'
+        versionCode 443
+        versionName '0.0.20181103'
         buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
     }
     // If the keystore file exists

app/tools/CMakeLists.txt

@@ -25,6 +25,7 @@ add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib
     CFLAGS=${CMAKE_C_FLAGS}\ -Wno-unused-command-line-argument
     LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}\ -fuse-ld=gold
     DESTDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+    BUILDDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../generated-src
 )
 # Hack to make it actually build as part of the default target
 add_dependencies(libwg.so libwg-go.so)

app/tools/libwg-go/.gitignore

@@ -1,2 +1,2 @@
-src/
+build/
 .gobuildversion

app/tools/libwg-go/Makefile

@@ -2,7 +2,11 @@
 #
 # Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
 
-FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go))
+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/*.c) $(wildcard src/*/*.go)
+
+BUILDDIR ?= $(CURDIR)/build
+DESTDIR ?= $(CURDIR)/out
 
 NDK_GO_ARCH_MAP_x86 := 386
 NDK_GO_ARCH_MAP_x86_64 := amd64
@@ -23,15 +27,11 @@ default: $(DESTDIR)/libwg-go.so
 
 GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m))
 GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
-GOBUILDVERSION := 1.11
+GOBUILDVERSION := 1.11.1
 GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
 GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH)
-
-GOBUILDVERSION_CURRENT := $(shell go version 2>/dev/null)
-ifeq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT))
-$(info Using system Go)
-else
-export GOROOT := $(CURDIR)/goroot
+export GOROOT := $(BUILDDIR)/goroot
+export GOPATH := $(BUILDDIR)/gopath
 export PATH := $(GOROOT)/bin:$(PATH)
 GOBUILDVERSION_CURRENT := $(shell $(GOROOT)/bin/go version 2>/dev/null)
 ifneq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT))
@@ -42,17 +42,24 @@ $(GOROOT)/bin/go:
 	mkdir -p "$(GOROOT)"
 	curl "$(GOBUILDTARBALL)" | tar -C "$(GOROOT)" --strip-components=1 -xzf - || { rm -rf "$(GOROOT)"; exit 1; }
 	patch -p1 -f -N -r- -d "$(GOROOT)" < goruntime-boottime-over-monotonic.diff || { rm -rf "$(GOROOT)"; exit 1; }
-$(DESTDIR)/libwg-go.so: $(GOROOT)/bin/go
-endif
 
 $(shell test "$$(cat .gobuildversion 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.so")
 
-$(DESTDIR)/libwg-go.so: $(FILES) src/git.zx2c4.com/wireguard-go/api-android.go src/git.zx2c4.com/wireguard-go/tun/api-android.go src/git.zx2c4.com/wireguard-go/jni.c
-	@goroot="$$(go env GOROOT)" || exit 1; patch -p1 -f -R -s --dry-run -d "$$goroot" < goruntime-boottime-over-monotonic.diff >/dev/null 2>&1 || { echo "ERROR: Your system's Go is not patched to use the suspend-aware monotonic clock. Please try again after having run: \`patch -p1 -d \"$$goroot\" < \"$(CURDIR)/goruntime-boottime-over-monotonic.diff\"\`."; exit 1; }
-	find . -name '*.go' -type l -delete
-	find . -type d -empty -delete
-	mkdir -p $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILES)))
-	$(foreach FILE,$(FILES),ln -sfrt $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILE))) $(FILE);)
-	GOPATH=$(PWD) go get -v -d git.zx2c4.com/wireguard-go
-	GOPATH=$(PWD) go build -ldflags="-X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o $(DESTDIR)/libwg-go.so -buildmode c-shared git.zx2c4.com/wireguard-go
+define copy-src-to-build
+$(subst $(1),$(BUILDDIR)/,$(2)): $(2)
+	@mkdir -vp "$$(dir $$@)"
+	@cp -vp "$$<" "$$@"
+$(BUILDDIR)/.prepared: $(subst $(1),$(BUILDDIR)/,$(2))
+endef
+
+$(foreach FILE,$(UPSTREAM_FILES),$(eval $(call copy-src-to-build,../wireguard-go/,$(FILE))))
+$(foreach FILE,$(DOWNSTREAM_FILES),$(eval $(call copy-src-to-build,src/,$(FILE))))
+
+$(BUILDDIR)/.prepared: $(GOROOT)/bin/go
+	cd "$(BUILDDIR)" && go get || { chmod -fR +w "$(GOPATH)/pkg/mod"; rm -rf "$(GOPATH)/pkg/mod"; exit 1; }
+	chmod -fR +w "$(GOPATH)/pkg/mod"
+	touch "$@"
+
+$(DESTDIR)/libwg-go.so: $(BUILDDIR)/.prepared
+	cd "$(BUILDDIR)" && go build -ldflags="-X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o "$@" -buildmode c-shared
 	go version > .gobuildversion

app/tools/libwg-go/src/tun/api-android.go

@@ -11,11 +11,13 @@ import (
 )
 
 func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) {
+	file := os.NewFile(uintptr(tun_fd), "/dev/tun")
 	tun := &nativeTun{
-		fd:     os.NewFile(uintptr(tun_fd), "/dev/tun"),
-		events: make(chan TUNEvent, 5),
-		errors: make(chan error, 5),
-		nopi:   true,
+		tunFile: file,
+		fd:      file.Fd(),
+		events:  make(chan TUNEvent, 5),
+		errors:  make(chan error, 5),
+		nopi:    true,
 	}
 	var err error
 	tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd)