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
diff --git a/java/base.go b/java/base.go
index 6e42aef..55d77dc 100644
--- a/java/base.go
+++ b/java/base.go
@@ -1488,14 +1488,7 @@
}
// Dex compilation
var dexOutputFile android.OutputPath
- params := &compileDexParams{
- flags: flags,
- sdkVersion: j.SdkVersion(ctx),
- minSdkVersion: j.MinSdkVersion(ctx),
- classesJar: implementationAndResourcesJar,
- jarName: jarName,
- }
- dexOutputFile = j.dexer.compileDex(ctx, params)
+ dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), implementationAndResourcesJar, jarName)
if ctx.Failed() {
return
}