Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51d6d13 authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Expand visiblity error"

parents 509a9d35 e501bb4d

android/visibility.go

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ func visibilityRuleEnforcer(ctx TopDownMutatorContext) { 


		rule := effectiveVisibilityRules(ctx.Config(), depQualified)

		if !rule.matches(qualified) {

			ctx.ModuleErrorf("depends on %s which is not visible to this module", depQualified)

			ctx.ModuleErrorf("depends on %s which is not visible to this module\nYou may need to add %q to its visibility", depQualified, "//"+ctx.ModuleDir())

		}

	})

}

android/visibility_test.go

+2 −2
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ var visibilityTests = []struct { 
				}`),

		},

		expectedErrors: []string{

			`module "libnamespace" variant "android_common": depends on //top:libexample which is not visible to this module`,

			`module "libnamespace" variant "android_common": depends on //top:libexample which is not visible to this module\nYou may need to add "//namespace" to its visibility`,

		},

	},

	{
@@ -760,7 +760,7 @@ var visibilityTests = []struct { 
				}`),

		},

		expectedErrors: []string{

			`module "libnamespace" variant "android_common": depends on //top:libexample which is not visible to this module`,

			`module "libnamespace" variant "android_common": depends on //top:libexample which is not visible to this module\nYou may need to add "//namespace" to its visibility`,

		},

	},

	{