From 7eb9243fa78189000da9d5beeabaea3b8b2c0fd5 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 4 Jan 2023 22:14:59 +0000 Subject: 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 --- java/java.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'java/java.go') 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 } -- cgit v1.2.3-59-g8ed1b