Revert^2 "Rename DexJar interface method to DexJarBuildPath."
This reverts commit b0dc851ff4eca650042b52ce4ff06cb7e0312b77.
Reason for revert: relanding original change. Build failures were
caused by a race with another CL: https://r.android.com/1320920
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Ic9016582dae7773b4d4f84a63425f1ef7a5d061f
diff --git a/apex/apex.go b/apex/apex.go
index 8fd80fc..b9fc4e1 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1650,14 +1650,14 @@
}
type javaDependency interface {
- DexJar() android.Path
+ DexJarBuildPath() android.Path
JacocoReportClassesFile() android.Path
Stem() string
}
func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaDependency, module android.Module) apexFile {
dirInApex := "javalib"
- fileToCopy := lib.DexJar()
+ fileToCopy := lib.DexJarBuildPath()
af := newApexFile(ctx, fileToCopy, module.Name(), dirInApex, javaSharedLib, module)
af.jacocoReportClassesFile = lib.JacocoReportClassesFile()
af.stem = lib.Stem() + ".jar"