From 0ba06196d50827a16cdcbc63b7866ad34d48bc3c Mon Sep 17 00:00:00 2001
From: Frederick Akalin <akalin@keyba.se>
Date: Mon, 4 Dec 2017 15:40:05 -0800
Subject: [PATCH] Apply fix from https://github.com/golang/go/issues/22766

---
 .../golang.org/x/mobile/bind/java/seq_android.c.support    | 1 +
 go/vendor/vendor.json                                      | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/go/vendor/golang.org/x/mobile/bind/java/seq_android.c.support b/go/vendor/golang.org/x/mobile/bind/java/seq_android.c.support
index fbc6d55fa2af..7c0f4831099a 100644
--- a/go/vendor/golang.org/x/mobile/bind/java/seq_android.c.support
+++ b/go/vendor/golang.org/x/mobile/bind/java/seq_android.c.support
@@ -11,6 +11,7 @@
 #include <jni.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <pthread.h>
 #include "seq.h"
diff --git a/go/vendor/vendor.json b/go/vendor/vendor.json
index 4f8f09ce7f28..62920487b0d5 100644
--- a/go/vendor/vendor.json
+++ b/go/vendor/vendor.json
@@ -1,5 +1,8 @@
 {
-	"comment": "Ignore solaris flag because of go-isatty",
+        "comment": [
+                "Ignore solaris flag because of go-isatty",
+                "Applied patch for gomobile as described in https://github.com/golang/go/issues/22766"
+        ],
 	"ignore": "test solaris",
 	"package": [
 		{
@@ -702,7 +705,7 @@
 			"revisionTime": "2016-12-08T01:05:43Z"
 		},
 		{
-			"checksumSHA1": "e+IpBa33pQHj8WUFjkZ9Kf+pOF0=",
+                        "checksumSHA1": "e+IpBa33pQHj8WUFjkZ9Kf+pOF0=",
 			"path": "golang.org/x/mobile",
 			"revision": "b28c5379a52d34717fd23307abe34f933d42850a",
 			"revisionTime": "2017-11-26T19:38:07Z",