Merge "Error if visibility specifies a module"

This commit is contained in:
Liz Kammer 2020-10-19 19:06:49 +00:00 committed by Gerrit Code Review
commit e72e1ff98b

View file

@ -351,7 +351,10 @@ func parseRules(ctx BaseModuleContext, currentPkg, property string, visibility [
case "__subpackages__":
r = subpackagesRule{pkg}
default:
continue
ctx.PropertyErrorf(property, "invalid visibility pattern %q. Must match "+
" //<package>:<scope>, //<package> or :<scope> "+
"where <scope> is one of \"__pkg__\", \"__subpackages__\"",
v)
}
}
@ -397,7 +400,8 @@ func splitRule(ctx BaseModuleContext, ruleExpression string, currentPkg, propert
// ensure all the rules on this module are checked.
ctx.PropertyErrorf(property,
"invalid visibility pattern %q must match"+
" //<package>:<module>, //<package> or :<module>",
" //<package>:<scope>, //<package> or :<scope> "+
"where <scope> is one of \"__pkg__\", \"__subpackages__\"",
ruleExpression)
return false, "", ""
}