summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
Diffstat (limited to 'apex')
-rw-r--r--apex/apex.go4
-rw-r--r--apex/apex_test.go4
2 files changed, 2 insertions, 6 deletions
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 ""
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 1382f6903..ef863f41e 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -11368,7 +11368,7 @@ func TestInstallationRulesForMultipleApexPrebuilts(t *testing.T) {
variation := func(moduleName string) string {
ret := "android_common_com.android.foo"
if moduleName == "com.google.android.foo" {
- ret = "android_common_com.google.android.foo_com.google.android.foo"
+ ret = "android_common_com.google.android.foo"
}
return ret
}
@@ -11883,7 +11883,7 @@ func TestOverrideApexWithPrebuiltApexPreferred(t *testing.T) {
}
`)
- java.CheckModuleHasDependency(t, res.TestContext, "myoverrideapex", "android_common_myoverrideapex_myoverrideapex", "foo")
+ java.CheckModuleHasDependency(t, res.TestContext, "myoverrideapex", "android_common_myoverrideapex", "foo")
}
func TestUpdatableApexMinSdkVersionCurrent(t *testing.T) {