Revert "R8/D8 should use sdk_version prop to determine API surface stability."

This reverts commit daa220ae8c.

Reason for revert: Suspected to be a cause for build failure (b/264446640). Will use go/abtd to verify

Change-Id: Ibfdf893f2426b1119923467027e0acedd08808c1
This commit is contained in:
Spandan Das
2023-01-04 22:14:59 +00:00
committed by Gerrit Code Review
parent daa220ae8c
commit 7eb9243fa7
4 changed files with 15 additions and 38 deletions

View File

@@ -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
}