Merge "Error if visibility specifies a module" (e72e1ff9) · Commits · e / os / android_build_soong

android/visibility.go

+6 −2

Original line number	Diff line number	Diff line
		@@ -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, "", ""
		}