Merge changes from topics "apex_transition_info", "bcp_dependency_through_apex" into main

* changes:
  Convert android.TransitionMutator to TransitionInfo
  Pass libraryToApex and apexNameToFragment mappings into CreateClasspathElements
  Convert apex transition tag to dependency on apex
  Add extra dependency from apex to bootclasspath fragments to modules
  Move prebuilt mutators earlier

1 files changed, 2 insertions, 2 deletions

diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index 7d21b7a61..2c8694237 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -171,11 +171,11 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu
 	// Now match the apex part of the boot image configuration.
 	requiredApex := configuredBootJars.Apex(index)
 	if android.IsConfiguredJarForPlatform(requiredApex) {
-		if len(apexInfo.InApexVariants) != 0 {
+		if apexInfo.ApexVariationName != "" {
 			// A platform variant is required but this is for an apex so ignore it.
 			return false
 		}
-	} else if !apexInfo.InApexVariant(requiredApex) {
+	} else if apexInfo.BaseApexName != requiredApex {
 		// An apex variant for a specific apex is required but this is the wrong apex.
 		return false
 	}