From c5f4de515f5d1686ed5164dddc2f28134c9aeee4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 9 Jan 2025 16:04:41 -0800 Subject: Don't enforce visiblity on platformBootclasspathImplLibDepTag When the dependencies that use platformBootclasspathImplLibDepTag are moved earlier they are checked by the visibility enforcement mutator. Implement ExcludeFromVisibilityEnforcementTag so they don't require visibility. Test: go test ./... Change-Id: I6019228561530bd406936fd0d2a16eff471c148d --- java/platform_bootclasspath.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 152eb1eeb..86062d489 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -15,6 +15,8 @@ package java import ( + "github.com/google/blueprint" + "android/soong/android" "android/soong/dexpreopt" ) @@ -33,9 +35,18 @@ var ( platformBootclasspathArtBootJarDepTag = bootclasspathDependencyTag{name: "art-boot-jar"} platformBootclasspathBootJarDepTag = bootclasspathDependencyTag{name: "platform-boot-jar"} platformBootclasspathApexBootJarDepTag = bootclasspathDependencyTag{name: "apex-boot-jar"} - platformBootclasspathImplLibDepTag = dependencyTag{name: "impl-lib-tag"} ) +type platformBootclasspathImplLibDepTagType struct { + blueprint.BaseDependencyTag +} + +func (p platformBootclasspathImplLibDepTagType) ExcludeFromVisibilityEnforcement() {} + +var platformBootclasspathImplLibDepTag platformBootclasspathImplLibDepTagType + +var _ android.ExcludeFromVisibilityEnforcementTag = platformBootclasspathImplLibDepTag + type platformBootclasspathModule struct { android.ModuleBase ClasspathFragmentBase -- cgit v1.2.3-59-g8ed1b