StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" am: c55b679e7b am: 651a63ca9d am: 7e59e8e2df am: de5e9d46ab am: df2e88d269

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324371

Change-Id: I4bd4f0db8acbb9b8267ee3efd1b25dd878bb7f31
This commit is contained in:
Ulyana Trafimovich
2020-06-04 11:53:12 +00:00
committed by Automerger Merge Worker
parent 87d88f7b13 df2e88d269
commit f6b7c5199e
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -1691,7 +1691,7 @@ type javaDependency interface {
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"