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

Merge "Error if visibility specifies a module"

Browse Source
This commit is contained in:
Liz Kammer
2020-10-19 19:06:49 +00:00
committed by Gerrit Code Review
parent 18e990ec1d 873f4b612a
commit e72e1ff98b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/visibility.go
View File

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