From 105d09403094e28f70e311931f08ab6e68d425de Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Wed, 14 Aug 2019 17:02:36 +0200
Subject: [PATCH] cmd/gio: drop appDir function

It's not worth its weight.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 cmd/gio/androidbuild.go | 2 +-
 cmd/gio/gio.go          | 5 -----
 cmd/gio/iosbuild.go     | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/cmd/gio/androidbuild.go b/cmd/gio/androidbuild.go
index d8b9f9b9..e0f27c52 100644
--- a/cmd/gio/androidbuild.go
+++ b/cmd/gio/androidbuild.go
@@ -125,7 +125,7 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
 			return err
 		})
 	}
-	appDir, err := appDir()
+	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/ui/app"))
 	if err != nil {
 		return err
 	}
diff --git a/cmd/gio/gio.go b/cmd/gio/gio.go
index e8e05b27..0c8f8d24 100644
--- a/cmd/gio/gio.go
+++ b/cmd/gio/gio.go
@@ -158,11 +158,6 @@ func copyFile(dst, src string) (err error) {
 	return err
 }
 
-func appDir() (string, error) {
-	cmd := exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/ui/app")
-	return runCmd(cmd)
-}
-
 type arch struct {
 	iosArch string
 	jniArch string
diff --git a/cmd/gio/iosbuild.go b/cmd/gio/iosbuild.go
index 3dfe092a..9ef39d3b 100644
--- a/cmd/gio/iosbuild.go
+++ b/cmd/gio/iosbuild.go
@@ -320,7 +320,7 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
 	if _, err := runCmd(lipo); err != nil {
 		return err
 	}
-	appDir, err := appDir()
+	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/ui/app"))
 	if err != nil {
 		return err
 	}