Merge "Fix soong_ui with empty arguments"

am: 21dc570e5f

Change-Id: Id1948fecdbb935b1d3e861aec39aa090e3ba2da5
This commit is contained in:
Dan Willemsen
2017-10-18 05:34:14 +00:00
committed by android-build-merger

View File

@@ -154,7 +154,7 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
c.verbose = true
} else if arg == "--skip-make" {
c.skipMake = true
} else if arg[0] == '-' {
} else if len(arg) > 0 && arg[0] == '-' {
parseArgNum := func(def int) int {
if len(arg) > 2 {
p, err := strconv.ParseUint(arg[2:], 10, 31)
@@ -172,9 +172,9 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
return def
}
if arg[1] == 'j' {
if len(arg) > 1 && arg[1] == 'j' {
c.parallel = parseArgNum(c.parallel)
} else if arg[1] == 'k' {
} else if len(arg) > 1 && arg[1] == 'k' {
c.keepGoing = parseArgNum(0)
} else {
ctx.Fatalln("Unknown option:", arg)