Revert "Revert "R8/D8 should use sdk_version prop to determine API surface stability.""
This reverts commit 7eb9243fa7
.
Reason for revert: The original change was reverted since it was suspected to cause missing libc++.so errors. It was a red herring, and the root cause has been fixed now b/264588525
Change-Id: Ib9110c41bacf220b91f24de11589f63235895e56
This commit is contained in:
committed by
Gerrit Code Review
parent
7eb9243fa7
commit
c404cc79e9
10
java/java.go
10
java/java.go
@@ -1981,7 +1981,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
|
||||
}
|
||||
|
Reference in New Issue
Block a user