diff options
| author | 2021-08-06 18:33:23 +0000 | |
|---|---|---|
| committer | 2021-08-06 18:33:23 +0000 | |
| commit | 795a9f99f4155a568e93f502dfd420a37082ff25 (patch) | |
| tree | 95dd71cfa8a0bb549dc7c090d25a5296195a53cc /java/base.go | |
| parent | 03349188bc3efea0e1bfae71ab70953cfdf76c52 (diff) | |
| parent | a79a52c7c470392f55eb7db9a1c2f4f4e3f47989 (diff) | |
Merge "Reland: Pass jars with resources to R8"
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/base.go b/java/base.go index 6b8119619..d8cd6b3c1 100644 --- a/java/base.go +++ b/java/base.go @@ -1230,7 +1230,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { } // Dex compilation var dexOutputFile android.OutputPath - dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), outputFile, jarName) + dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), implementationAndResourcesJar, jarName) if ctx.Failed() { return } |