From 697f25de1354350472ac0d9ae7392faffb74358c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 17 Dec 2024 15:27:16 -0800
Subject: Remove extraneous variation name from OverrideApex

Apexes use an empty variation name for themselves, and only set an
extra variation string for dependencies.  OverrideApex is setting
the variation name for itself, which doesn't match apexes and is
unnecessary.

Test: go test ./apex
Change-Id: I6e726c497ccf10f145cda149bd19849fd22dd20b
---
 apex/apex.go | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'apex/apex.go')

diff --git a/apex/apex.go b/apex/apex.go
index a3106717a..d35b40469 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1202,8 +1202,6 @@ func (a *apexTransitionMutator) Split(ctx android.BaseModuleContext) []string {
 			return []string{overridable.GetOverriddenBy()}
 		}
 		return []string{ai.ApexVariationName()}
-	} else if _, ok := ctx.Module().(*OverrideApex); ok {
-		return []string{ctx.ModuleName()}
 	}
 	return []string{""}
 }
@@ -1220,8 +1218,6 @@ func (a *apexTransitionMutator) IncomingTransition(ctx android.IncomingTransitio
 			return overridable.GetOverriddenBy()
 		}
 		return ai.ApexVariationName()
-	} else if _, ok := ctx.Module().(*OverrideApex); ok {
-		return ctx.Module().Name()
 	}
 
 	return ""
-- 
cgit v1.2.3-59-g8ed1b