Explicitly specify visibility in sdk/module_exports snapshot
This change ensures that each prebuilt in a snapshot explicitly
specifies its visibility even when that visibility is the current
default. This is done for two reasons:
1. It simplifies a follow up change that adds visibility rules to an
existing set of rules.
2. It ensures that the snapshots are independent of the current Soong
default visibility.
The latter is important because we intend to switch from modules being
visible to everyone by default (i.e. //visibility:public) to only being
visible to modules in the same package (i.e. //visibility:private). By
making the snapshots of modules that do not specify any visibility
explicitly specify that they are "//visibility:public" it ensures that
the snapshots will not need to be changed when the default changes.
Bug: 168301990
Test: m nothing
Change-Id: Ia034f4a1e5124c17f46d73b0e9a6c5f2a251038e
diff --git a/android/visibility.go b/android/visibility.go
index 68da1c4..38f80af 100644
--- a/android/visibility.go
+++ b/android/visibility.go
@@ -441,12 +441,19 @@
}
rule := effectiveVisibilityRules(ctx.Config(), depQualified)
- if rule != nil && !rule.matches(qualified) {
+ if !rule.matches(qualified) {
ctx.ModuleErrorf("depends on %s which is not visible to this module", depQualified)
}
})
}
+// Default visibility is public.
+var defaultVisibility = compositeRule{publicRule{}}
+
+// Return the effective visibility rules.
+//
+// If no rules have been specified this will return the default visibility rule
+// which is currently //visibility:public.
func effectiveVisibilityRules(config Config, qualified qualifiedModuleName) compositeRule {
moduleToVisibilityRule := moduleToVisibilityRuleMap(config)
value, ok := moduleToVisibilityRule.Load(qualified)
@@ -456,6 +463,12 @@
} else {
rule = packageDefaultVisibility(config, qualified)
}
+
+ // If no rule is specified then return the default visibility rule to avoid
+ // every caller having to treat nil as public.
+ if rule == nil {
+ rule = defaultVisibility
+ }
return rule
}
@@ -499,7 +512,7 @@
// Modules are implicitly visible to other modules in the same package,
// without checking the visibility rules. Here we need to add that visibility
// explicitly.
- if rule != nil && !rule.matches(qualified) {
+ if !rule.matches(qualified) {
if len(rule) == 1 {
if _, ok := rule[0].(privateRule); ok {
// If the rule is //visibility:private we can't append another
@@ -508,7 +521,7 @@
// modules are implicitly visible within the package we get the same
// result without any rule at all, so just make it an empty list to be
// appended below.
- rule = compositeRule{}
+ rule = nil
}
}
rule = append(rule, packageRule{dir})