diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-02-23 21:39:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-23 21:39:49 +0000 |
| commit | de1d5bc90c84775728d8ef08d0aade2b7b370aa3 (patch) | |
| tree | 92b409966b7baebe49bfd824df525758d78b83a8 /java/java.go | |
| parent | 8393a0fcdc936afaad496447c782d0f292d3eeb5 (diff) | |
| parent | c404cc79e9df9718428f980b0623cda6cdb26d7c (diff) | |
Merge "Revert "Revert "R8/D8 should use sdk_version prop to determine API surface stability."""
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 89bd2ebe6..27b2a6ec6 100644 --- a/java/java.go +++ b/java/java.go @@ -2067,7 +2067,15 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex var dexOutputFile android.OutputPath - dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), outputFile, jarName) + dexParams := &compileDexParams{ + flags: flags, + sdkVersion: j.SdkVersion(ctx), + minSdkVersion: j.MinSdkVersion(ctx), + classesJar: outputFile, + jarName: jarName, + } + + dexOutputFile = j.dexer.compileDex(ctx, dexParams) if ctx.Failed() { return } |