Fix soong_zip --help

am: 7f276c6b77

Change-Id: Ic92068e1f7d65baa161e45dce2460af502334b11
This commit is contained in:
Dan Willemsen
2019-04-21 02:42:21 -07:00
committed by android-build-merger

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")