From bbab1c107990a5e6b5d68f7b7fcd8d1176ae1ccf Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Fri, 13 Jul 2018 11:22:28 -0500
Subject: [PATCH] properly save output of gomobile init to GOROOT/pkg

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3fa164e..c5209fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,11 +85,12 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 # Add in gomobile
 
 RUN go get golang.org/x/mobile/cmd/gomobile
-RUN mv /go/bin/gomobile /usr/local/bin
-
 RUN go get golang.org/x/mobile/cmd/gobind
-RUN mv /go/bin/gobind /usr/local/bin
+
+RUN mv /go/bin/* /usr/local/bin
 
 RUN gomobile init -ndk $ANDROID_HOME/ndk-bundle/
 
+RUN mv /go/pkg* /usr/local/pkg
+
 ENV GOPATH /workspace/go