diff --git a/cmd/gomobile/doc.go b/cmd/gomobile/doc.go
index c17cf4c..6145bd2 100644
--- a/cmd/gomobile/doc.go
+++ b/cmd/gomobile/doc.go
@@ -24,7 +24,7 @@
bind build a library for Android and iOS
build compile android APK and iOS app
clean remove object files and cached gomobile files
- init build OpenAL for Android
+ init initialize gomobile tools and optionally build OpenAL for Android
install compile android APK and install on device
version print version
@@ -52,9 +52,10 @@
the module import wizard (File > New > New Module > Import .JAR or
.AAR package), and setting it as a new dependency
(File > Project Structure > Dependencies). This requires 'javac'
-(version 1.7+) and Android SDK (API level 16 or newer) to build the
-library for Android. The environment variable ANDROID_HOME must be set
-to the path to Android SDK. Use the -javapkg flag to specify the Java
+(version 1.8+) and Android SDK (API level 16 or newer) to build the
+library for Android. The ANDROID_HOME and ANDROID_NDK_HOME environment
+variables can be used to specify the Android SDK and NDK if they are
+not in the default locations. Use the -javapkg flag to specify the Java
package prefix for the generated classes.
By default, -target=android builds shared libraries for all supported
@@ -72,8 +73,9 @@
The -v flag provides verbose output, including the list of packages built.
-The build flags -a, -n, -x, -gcflags, -ldflags, -tags, -trimpath, and -work
-are shared with the build command. For documentation, see 'go help build'.
+The build flags -a, -n, -x, -gcflags, -ldflags, -overlay, -tags, -trimpath,
+and -work are shared with the build command. For documentation,
+see 'go help build'.
# Compile android APK and iOS app
@@ -126,8 +128,9 @@
The -v flag provides verbose output, including the list of packages built.
-The build flags -a, -i, -n, -x, -gcflags, -ldflags, -tags, -trimpath, and -work are
-shared with the build command. For documentation, see 'go help build'.
+The build flags -a, -i, -n, -x, -gcflags, -ldflags, -overlay, -tags, -trimpath,
+and -work are shared with the build command. For documentation, see
+'go help build'.
# Remove object files and cached gomobile files
@@ -135,9 +138,9 @@
gomobile clean
-Clean removes object files and cached NDK files downloaded by gomobile init.
+# Clean removes object files and cached NDK files downloaded by gomobile init
-# Build OpenAL for Android
+# Initialize gomobile tools and optionally build OpenAL for Android
Usage:
@@ -158,8 +161,8 @@
Only -target android is supported. The 'adb' tool must be on the PATH.
-The build flags -a, -i, -n, -x, -gcflags, -ldflags, -tags, -trimpath, and -work are
-shared with the build command.
+The build flags -a, -i, -n, -x, -gcflags, -ldflags, -overlay, -tags, -trimpath,
+and -work are shared with the build command.
For documentation, see 'go help build'.
# Print version
@@ -170,4 +173,4 @@
Version prints versions of the gomobile binary and tools
*/
-package main
+package main // import "golang.org/x/mobile/cmd/gomobile"
diff --git a/cmd/gomobile/init.go b/cmd/gomobile/init.go
index 86f1401..32f156f 100644
--- a/cmd/gomobile/init.go
+++ b/cmd/gomobile/init.go
@@ -28,7 +28,7 @@
run: runInit,
Name: "init",
Usage: "[-openal dir]",
- Short: "build OpenAL for Android",
+ Short: "initialize gomobile tools and optionally build OpenAL for Android",
Long: `
If a OpenAL source directory is specified with -openal, init will
build an Android version of OpenAL for use with gomobile build
diff --git a/cmd/gomobile/init_test.go b/cmd/gomobile/init_test.go
index 0e73717..76a803f 100644
--- a/cmd/gomobile/init_test.go
+++ b/cmd/gomobile/init_test.go
@@ -118,6 +118,12 @@
}
}
+func TestInitHelp(t *testing.T) {
+ if got, want := cmdInit.Short, "initialize gomobile tools and optionally build OpenAL for Android"; got != want {
+ t.Errorf("cmdInit.Short = %q, want %q", got, want)
+ }
+}
+
func diffOutput(got string, wantTmpl *template.Template) (string, error) {
got = filepath.ToSlash(got)