diff options
author | Colin Cross <ccross@android.com> | 2018-07-17 00:14:33 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-17 00:14:33 +0000 |
commit | cdec7e7ee1d3b6555189b67cae7cffc10ba4bc8f (patch) | |
tree | 6f10e643e482e24b54775ae0d6141af44066b5ca /cmd | |
parent | 6d6faa1a1fe7e9e712f563d7e59f9fe9fc318898 (diff) | |
parent | fe5a3b7fac1eea348e920c4c374b274892c7c62a (diff) | |
download | build_soong-cdec7e7ee1d3b6555189b67cae7cffc10ba4bc8f.tar.gz build_soong-cdec7e7ee1d3b6555189b67cae7cffc10ba4bc8f.tar.bz2 build_soong-cdec7e7ee1d3b6555189b67cae7cffc10ba4bc8f.zip |
Merge changes I5b8522aa,I541aea75
* changes:
Fix lint errors caught by go test
Fix .kotlin_builtins glob
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/dep_fixer/main.go | 2 | ||||
-rw-r--r-- | cmd/path_interposer/main_test.go | 2 | ||||
-rw-r--r-- | cmd/pom2bp/pom2bp.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/dep_fixer/main.go b/cmd/dep_fixer/main.go index bac3772b..0647fb29 100644 --- a/cmd/dep_fixer/main.go +++ b/cmd/dep_fixer/main.go @@ -29,7 +29,7 @@ import ( func main() { flag.Usage = func() { - fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>") + fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>", os.Args[0]) flag.PrintDefaults() } output := flag.String("o", "", "Optional output file (defaults to rewriting source if necessary)") diff --git a/cmd/path_interposer/main_test.go b/cmd/path_interposer/main_test.go index 4b25c446..c89d6231 100644 --- a/cmd/path_interposer/main_test.go +++ b/cmd/path_interposer/main_test.go @@ -183,7 +183,7 @@ func TestMissingPath(t *testing.T) { interposer := setup(t) err := os.Remove(interposer + "_origpath") if err != nil { - t.Fatalf("Failed to remove:", err) + t.Fatal("Failed to remove:", err) } exitCode, err := Main(ioutil.Discard, ioutil.Discard, interposer, []string{"true"}, mainOpts{}) diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go index 9aa25f07..9ce6b504 100644 --- a/cmd/pom2bp/pom2bp.go +++ b/cmd/pom2bp/pom2bp.go @@ -524,7 +524,7 @@ Usage: %s [--rewrite <regex>=<replace>] [-exclude <module>] [--extra-deps <modul if pom.IsAar() { err := pom.ExtractMinSdkVersion() if err != nil { - fmt.Fprintln(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err) + fmt.Fprintf(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err) os.Exit(1) } } |