diff options
Diffstat (limited to 'android/visibility.go')
| -rw-r--r-- | android/visibility.go | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/android/visibility.go b/android/visibility.go index a597687c0..3f04123cd 100644 --- a/android/visibility.go +++ b/android/visibility.go @@ -186,8 +186,8 @@ func (r privateRule) String() string { var visibilityRuleMap = NewOnceKey("visibilityRuleMap") // The map from qualifiedModuleName to visibilityRule. -func moduleToVisibilityRuleMap(ctx BaseModuleContext) *sync.Map { - return ctx.Config().Once(visibilityRuleMap, func() interface{} { +func moduleToVisibilityRuleMap(config Config) *sync.Map { + return config.Once(visibilityRuleMap, func() interface{} { return &sync.Map{} }).(*sync.Map) } @@ -304,7 +304,7 @@ func visibilityRuleGatherer(ctx BottomUpMutatorContext) { if visibility := m.visibility(); visibility != nil { rule := parseRules(ctx, currentPkg, m.visibility()) if rule != nil { - moduleToVisibilityRuleMap(ctx).Store(qualifiedModuleId, rule) + moduleToVisibilityRuleMap(ctx.Config()).Store(qualifiedModuleId, rule) } } } @@ -312,6 +312,7 @@ func visibilityRuleGatherer(ctx BottomUpMutatorContext) { func parseRules(ctx BaseModuleContext, currentPkg string, visibility []string) compositeRule { rules := make(compositeRule, 0, len(visibility)) hasPrivateRule := false + hasPublicRule := false hasNonPrivateRule := false for _, v := range visibility { ok, pkg, name := splitRule(v, currentPkg) @@ -328,6 +329,7 @@ func parseRules(ctx BaseModuleContext, currentPkg string, visibility []string) c isPrivateRule = true case "public": r = publicRule{} + hasPublicRule = true } } else { switch name { @@ -355,6 +357,11 @@ func parseRules(ctx BaseModuleContext, currentPkg string, visibility []string) c return compositeRule{privateRule{}} } + if hasPublicRule { + // Public overrides all other rules so just return it. + return compositeRule{publicRule{}} + } + return rules } @@ -415,21 +422,21 @@ func visibilityRuleEnforcer(ctx TopDownMutatorContext) { return } - rule := effectiveVisibilityRules(ctx, depQualified) + rule := effectiveVisibilityRules(ctx.Config(), depQualified) if rule != nil && !rule.matches(qualified) { ctx.ModuleErrorf("depends on %s which is not visible to this module", depQualified) } }) } -func effectiveVisibilityRules(ctx BaseModuleContext, qualified qualifiedModuleName) compositeRule { - moduleToVisibilityRule := moduleToVisibilityRuleMap(ctx) +func effectiveVisibilityRules(config Config, qualified qualifiedModuleName) compositeRule { + moduleToVisibilityRule := moduleToVisibilityRuleMap(config) value, ok := moduleToVisibilityRule.Load(qualified) var rule compositeRule if ok { rule = value.(compositeRule) } else { - rule = packageDefaultVisibility(ctx, qualified) + rule = packageDefaultVisibility(config, qualified) } return rule } @@ -441,8 +448,8 @@ func createQualifiedModuleName(ctx BaseModuleContext) qualifiedModuleName { return qualified } -func packageDefaultVisibility(ctx BaseModuleContext, moduleId qualifiedModuleName) compositeRule { - moduleToVisibilityRule := moduleToVisibilityRuleMap(ctx) +func packageDefaultVisibility(config Config, moduleId qualifiedModuleName) compositeRule { + moduleToVisibilityRule := moduleToVisibilityRuleMap(config) packageQualifiedId := moduleId.getContainingPackageId() for { value, ok := moduleToVisibilityRule.Load(packageQualifiedId) @@ -469,7 +476,7 @@ func EffectiveVisibilityRules(ctx BaseModuleContext, module Module) []string { dir := ctx.OtherModuleDir(module) qualified := qualifiedModuleName{dir, moduleName} - rule := effectiveVisibilityRules(ctx, qualified) + rule := effectiveVisibilityRules(ctx.Config(), qualified) return rule.Strings() } |