Remove AlwaysRequireApexVariantTag

Nothing implements AlwaysRequireApexVariantTag, remove it.

Bug: 372543712
Test: builds
Change-Id: Ie438d7a79e171f398b36ce1938249eb3145fcc9b

1 files changed, 1 insertions, 14 deletions

diff --git a/apex/apex.go b/apex/apex.go
index 5f700ee0e..acf290365 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -973,21 +973,8 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
 		if !ok || !am.CanHaveApexVariants() {
 			return false
 		}
-		depTag := mctx.OtherModuleDependencyTag(child)
 
-		// Check to see if the tag always requires that the child module has an apex variant for every
-		// apex variant of the parent module. If it does not then it is still possible for something
-		// else, e.g. the DepIsInSameApex(...) method to decide that a variant is required.
-		if required, ok := depTag.(android.AlwaysRequireApexVariantTag); ok && required.AlwaysRequireApexVariant() {
-			return true
-		}
-		if !android.IsDepInSameApex(mctx, parent, child) {
-			return false
-		}
-
-		// By default, all the transitive dependencies are collected, unless filtered out
-		// above.
-		return true
+		return android.IsDepInSameApex(mctx, parent, child)
 	}
 
 	android.SetProvider(mctx, android.ApexBundleInfoProvider, android.ApexBundleInfo{})