Merge changes I92cea061,I67705c5c
* changes:
Add spaces around := when dumping assignments
Fix govet issue
diff --git a/androidmk/parser/ast.go b/androidmk/parser/ast.go
index a7fac9f..07e1842 100644
--- a/androidmk/parser/ast.go
+++ b/androidmk/parser/ast.go
@@ -22,7 +22,7 @@
if x.Target != nil {
target = x.Target.Dump() + ": "
}
- return target + x.Name.Dump() + x.Type + x.Value.Dump()
+ return target + x.Name.Dump() + " " + x.Type + " " + x.Value.Dump()
}
func (x *Assignment) Pos() Pos {
diff --git a/cmd/soong_glob/soong_glob.go b/cmd/soong_glob/soong_glob.go
index 6f56bb9..83b8154 100644
--- a/cmd/soong_glob/soong_glob.go
+++ b/cmd/soong_glob/soong_glob.go
@@ -61,7 +61,7 @@
flag.Parse()
if *out == "" {
- fmt.Fprintln(os.Stderr, "error: -o is required\n")
+ fmt.Fprintf(os.Stderr, "error: -o is required\n")
usage()
}