commit b0dc851ff4eca650042b52ce4ff06cb7e0312b77
author Ulyana Trafimovich <skvadrik@google.com> Thu Jun 04 10:37:36 2020 +0000
committer Ulyana Trafimovich <skvadrik@google.com> Thu Jun 04 10:37:36 2020 +0000
tree 1ce9e288b8b2d7ea1e168fdb9f2c38cce623c0fe
parent 562c240185dd4adcbdb75d2924c69657f6ac7cff

Revert "Rename DexJar interface method to DexJarBuildPath."

This reverts commit 562c240185dd4adcbdb75d2924c69657f6ac7cff.

Reason for revert: breaks `lunch full-eng && m checkbuild`.

Change-Id: Id7c7d6240d98afaf8edd49b6c96cd05534b784cc

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 7a66b2e..d3c5df0 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1656,7 +1656,7 @@
 
 func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaDependency, module android.Module) apexFile {
 	dirInApex := "javalib"
-	fileToCopy := lib.DexJarBuildPath()
+	fileToCopy := lib.DexJar()
 	af := newApexFile(ctx, fileToCopy, module.Name(), dirInApex, javaSharedLib, module)
 	af.jacocoReportClassesFile = lib.JacocoReportClassesFile()
 	af.stem = lib.Stem() + ".jar"