summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2023-01-04 22:14:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-01-04 22:14:59 +0000
commit7eb9243fa78189000da9d5beeabaea3b8b2c0fd5 (patch)
tree7325596a605c2552e970964a6d1050c376d1bee4 /java/java.go
parentdaa220ae8ce36c3c155bb35b205a5826c779202c (diff)
Revert "R8/D8 should use sdk_version prop to determine API surface stability."
This reverts commit daa220ae8ce36c3c155bb35b205a5826c779202c. Reason for revert: Suspected to be a cause for build failure (b/264446640). Will use go/abtd to verify Change-Id: Ibfdf893f2426b1119923467027e0acedd08808c1
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go10
1 files changed, 1 insertions, 9 deletions
diff --git a/java/java.go b/java/java.go
index 1e8d7b9e9..b3abc9118 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1981,15 +1981,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex
var dexOutputFile android.OutputPath
- dexParams := &compileDexParams{
- flags: flags,
- sdkVersion: j.SdkVersion(ctx),
- minSdkVersion: j.MinSdkVersion(ctx),
- classesJar: outputFile,
- jarName: jarName,
- }
-
- dexOutputFile = j.dexer.compileDex(ctx, dexParams)
+ dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), outputFile, jarName)
if ctx.Failed() {
return
}