Revert "Use AddReverseVariationDependency to avoid 1-variant fal..."
Revert submission 3288584-use_AddReverseVariationDependency
Reason for revert: DroidMonitor created revert due to b/370639232.
Reverted changes: /q/submissionid:3288584-use_AddReverseVariationDependency
Change-Id: Idc9c66f09aecc93835ef972193650a4df6f03366
diff --git a/apex/vndk.go b/apex/vndk.go
index 5e630c0..3ececc5 100644
--- a/apex/vndk.go
+++ b/apex/vndk.go
@@ -20,7 +20,6 @@
"android/soong/android"
"android/soong/cc"
- "github.com/google/blueprint"
"github.com/google/blueprint/proptools"
)
@@ -67,14 +66,7 @@
vndkApexName := "com.android.vndk." + vndkVersion
if mctx.OtherModuleExists(vndkApexName) {
- // Reverse dependencies must exactly specify the variant they want, starting from the
- // current module's variant. But unlike cc modules, the vndk apex doesn't have
- // arch/image/link variations, so we explicitly remove them here.
- mctx.AddReverseVariationDependency([]blueprint.Variation{
- {Mutator: "arch", Variation: "common"},
- {Mutator: "image", Variation: ""},
- {Mutator: "link", Variation: ""},
- }, sharedLibTag, vndkApexName)
+ mctx.AddReverseDependency(mctx.Module(), sharedLibTag, vndkApexName)
}
} else if a, ok := mctx.Module().(*apexBundle); ok && a.vndkApex {
if a.IsNativeBridgeSupported() {