Add explicit visibility on the self package in EffectiveVisibilityRules. am: f8533bc636 (1704d676) · Commits · e / os / android_build_soong

android/visibility.go

+7 −0

Original line number	Diff line number	Diff line
		@@ -496,6 +496,13 @@ func EffectiveVisibilityRules(ctx BaseModuleContext, module Module) []string {

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

		// 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) {
		rule = append(rule, packageRule{dir})
		}

		return rule.Strings()
		}

+16 −4

Original line number	Diff line number	Diff line
		@@ -155,14 +155,20 @@ func TestSnapshotVisibility(t *testing.T) {
		java_import {
		name: "mysdk_myjavalib@current",
		sdk_member_name: "myjavalib",
		visibility: ["//other/foo"],
		visibility: [
		"//other/foo",
		"//package",
		],
		jars: ["java/myjavalib.jar"],
		}

		java_import {
		name: "myjavalib",
		prefer: false,
		visibility: ["//other/foo"],
		visibility: [
		"//other/foo",
		"//package",
		],
		jars: ["java/myjavalib.jar"],
		}

		@@ -183,14 +189,20 @@ java_import {
		java_import {
		name: "mysdk_mydefaultedjavalib@current",
		sdk_member_name: "mydefaultedjavalib",
		visibility: ["//other/bar"],
		visibility: [
		"//other/bar",
		"//package",
		],
		jars: ["java/mydefaultedjavalib.jar"],
		}

		java_import {
		name: "mydefaultedjavalib",
		prefer: false,
		visibility: ["//other/bar"],
		visibility: [
		"//other/bar",
		"//package",
		],
		jars: ["java/mydefaultedjavalib.jar"],
		}