diff options
| author | 2021-06-23 10:23:16 +0900 | |
|---|---|---|
| committer | 2021-06-23 10:45:28 +0900 | |
| commit | 4c4da0688c4a2e05bd1db6007556a8df19dd8185 (patch) | |
| tree | e3d44cad94e0a541ce1e7d5c109730e4146e699f /java/java.go | |
| parent | e7d190866af4ff6739468adab61c697d3f87e5f5 (diff) | |
fix: comparison between min_sdk_version
Added test demonstrates the error case. The bug was that java modules'
ShouldSupportSdkVersion() converts min_sdk_version into effective
version before comparison, which discards "preview" version into
"future" version. That caused a weird case like rejecting with error
"should support "S"" even when it is set to "S".
Bug: n/a
Test: m nothing
Change-Id: Ieb53f0097b2969a8535778b1286dbfa0d4895ad4
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index ae8adf277..87a813459 100644 --- a/java/java.go +++ b/java/java.go @@ -1416,12 +1416,8 @@ func (j *Import) ShouldSupportSdkVersion(ctx android.BaseModuleContext, if sdkSpec.Kind == android.SdkCore { return nil } - ver, err := sdkSpec.EffectiveVersion(ctx) - if err != nil { - return err - } - if ver.GreaterThan(sdkVersion) { - return fmt.Errorf("newer SDK(%v)", ver) + if sdkSpec.ApiLevel.GreaterThan(sdkVersion) { + return fmt.Errorf("newer SDK(%v)", sdkSpec.ApiLevel) } return nil } |