Use unique apex variations for bootclasspath fragments
Upcoming changes to the ApexInfo mutator will require unique apex
variations for the bootclasspath fragments, change them now to simplify
comparisons.
Test: go test ./...
Change-Id: Ia8880fe5ac22a7bd2fb9ddaeb3b04b9ae90b1701
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 497facb..093cc87 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -566,6 +566,9 @@
// The prebuilt might have been renamed by prebuilt_rename mutator if the source module does not exist.
// Remove the prebuilt_ prefix.
ctx.AddFarVariationDependencies(apexVariationOfSelected, dexpreoptBootJarDepTag, android.RemoveOptionalPrebuiltPrefix(selected))
+ } else {
+ // Couldn't find a dependency, do it again to report an error.
+ ctx.AddFarVariationDependencies(apexVariationOfSelected, dexpreoptBootJarDepTag, selected)
}
}
}