Merge changes Ia968e06b,I60192285,I0e857a64,Ia8880fe5,If7a92ca0, ... into main

* changes:
  Add explicitlyImpl to shared library dependency tags
  Don't enforce visiblity on platformBootclasspathImplLibDepTag
  Don't merge apex variations with different UsePlatformApis
  Use unique apex variations for bootclasspath fragments
  Correctly compute externalDep for dependencies of override_apex modules
  Remove extraneous variation name from OverrideApex

1 files changed, 12 insertions, 1 deletions

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