diff --git a/android/mutator.go b/android/mutator.go index a46d4beb1..10a815ae4 100644 --- a/android/mutator.go +++ b/android/mutator.go @@ -103,7 +103,7 @@ var postDeps = []RegisterMutatorFunc{ registerPathDepsMutator, RegisterPrebuiltsPostDepsMutators, RegisterVisibilityRuleEnforcer, - registerNeverallowMutator, + RegisterNeverallowMutator, RegisterOverridePostDepsMutators, } diff --git a/android/neverallow.go b/android/neverallow.go index 04ec27d20..cf09792e0 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -42,7 +42,7 @@ import ( // counts as a match // - it has none of the "Without" properties matched (same rules as above) -func registerNeverallowMutator(ctx RegisterMutatorsContext) { +func RegisterNeverallowMutator(ctx RegisterMutatorsContext) { ctx.BottomUp("neverallow", neverallowMutator).Parallel() } @@ -247,7 +247,7 @@ func neverallowMutator(ctx BottomUpMutatorContext) { } type ValueMatcher interface { - test(string) bool + Test(string) bool String() string } @@ -255,7 +255,7 @@ type equalMatcher struct { expected string } -func (m *equalMatcher) test(value string) bool { +func (m *equalMatcher) Test(value string) bool { return m.expected == value } @@ -266,7 +266,7 @@ func (m *equalMatcher) String() string { type anyMatcher struct { } -func (m *anyMatcher) test(value string) bool { +func (m *anyMatcher) Test(value string) bool { return true } @@ -280,7 +280,7 @@ type startsWithMatcher struct { prefix string } -func (m *startsWithMatcher) test(value string) bool { +func (m *startsWithMatcher) Test(value string) bool { return strings.HasPrefix(value, m.prefix) } @@ -292,7 +292,7 @@ type regexMatcher struct { re *regexp.Regexp } -func (m *regexMatcher) test(value string) bool { +func (m *regexMatcher) Test(value string) bool { return m.re.MatchString(value) } @@ -302,7 +302,7 @@ func (m *regexMatcher) String() string { type isSetMatcher struct{} -func (m *isSetMatcher) test(value string) bool { +func (m *isSetMatcher) Test(value string) bool { return value != "" } @@ -573,7 +573,7 @@ func hasProperty(properties []interface{}, prop ruleProperty) bool { } check := func(value string) bool { - return prop.matcher.test(value) + return prop.matcher.Test(value) } if matchValue(propertiesValue, check) { @@ -630,6 +630,6 @@ func neverallowRules(config Config) []Rule { // Overrides the default neverallow rules for the supplied config. // // For testing only. -func setTestNeverallowRules(config Config, testRules []Rule) { +func SetTestNeverallowRules(config Config, testRules []Rule) { config.Once(neverallowRulesKey, func() interface{} { return testRules }) } diff --git a/android/neverallow_test.go b/android/neverallow_test.go index 0373b7923..2fc42e31f 100644 --- a/android/neverallow_test.go +++ b/android/neverallow_test.go @@ -313,7 +313,7 @@ func TestNeverallow(t *testing.T) { t.Run(test.name, func(t *testing.T) { // If the test has its own rules then use them instead of the default ones. if test.rules != nil { - setTestNeverallowRules(config, test.rules) + SetTestNeverallowRules(config, test.rules) } _, errs := testNeverallow(config) CheckErrorsAgainstExpectations(t, errs, test.expectedErrors) @@ -327,7 +327,7 @@ func testNeverallow(config Config) (*TestContext, []error) { ctx.RegisterModuleType("java_library", newMockJavaLibraryModule) ctx.RegisterModuleType("java_library_host", newMockJavaLibraryModule) ctx.RegisterModuleType("java_device_for_host", newMockJavaLibraryModule) - ctx.PostDepsMutators(registerNeverallowMutator) + ctx.PostDepsMutators(RegisterNeverallowMutator) ctx.Register(config) _, errs := ctx.ParseBlueprintsFiles("Android.bp")