StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix soong_zip --help

Browse Source 
It was not printing out the flag descriptions because it was using the
default FlagSet instead of the custom FlagSet when calling
PrintDefaults.

Test: soong_zip --help
Change-Id: I8a5705f8701ce0c05dde144b9a14962faa384e65
This commit is contained in:
Dan Willemsen
2019-04-20 21:44:18 -07:00
parent 36ab727c82
commit 7f276c6b77
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zip/cmd/main.go
View File

@@ -105,12 +105,6 @@ var (
nonDeflatedFiles = make(uniqueSet) nonDeflatedFiles = make(uniqueSet)
) )
func usage() {
fmt.Fprintf(os.Stderr, "usage: soong_zip -o zipfile [-m manifest] [-C dir] [-f|-l file] [-D dir]...\n")
flag.PrintDefaults()
os.Exit(2)
}
func main() { func main() {
var expandedArgs []string var expandedArgs []string
for _, arg := range os.Args { for _, arg := range os.Args {
@@ -128,7 +122,11 @@ func main() {
} }
flags := flag.NewFlagSet("flags", flag.ExitOnError) flags := flag.NewFlagSet("flags", flag.ExitOnError)
flags.Usage = usage flags.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: soong_zip -o zipfile [-m manifest] [-C dir] [-f|-l file] [-D dir]...\n")
flags.PrintDefaults()
os.Exit(2)
}
out := flags.String("o", "", "file to write zip file to") out := flags.String("o", "", "file to write zip file to")
manifest := flags.String("m", "", "input jar manifest file name") manifest := flags.String("m", "", "input jar manifest file name")