diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-06 03:18:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-06 03:18:16 +0000 |
| commit | 8c56183fb71859bb32dfa023d865d0f83ed2dcde (patch) | |
| tree | be202aa3cdde3131619da88ba913e093024c8217 /java/java.go | |
| parent | 7fef94f57b6cd6d8ba713bd1ba2609ffe049e1dd (diff) | |
| parent | f58c46e36fbffc3422097529987d16ac1cf503f5 (diff) | |
Merge changes Id33bf640,I4d67b9b9
* changes:
Don't use incorrect version names like VER or BOARD even in tests
SdkSpec = Scope + ApiLevel
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 5fe8814f5..fa7c96eff 100644 --- a/java/java.go +++ b/java/java.go @@ -1156,7 +1156,7 @@ func (j *Import) TargetSdkVersion() android.SdkSpec { } func (j *Import) MinSdkVersionString() string { - return j.MinSdkVersion().Version.String() + return j.MinSdkVersion().ApiLevel.String() } func (j *Import) Prebuilt() *android.Prebuilt { @@ -1370,7 +1370,7 @@ func (j *Import) ShouldSupportSdkVersion(ctx android.BaseModuleContext, if err != nil { return err } - if ver.ApiLevel(ctx).GreaterThan(sdkVersion) { + if ver.GreaterThan(sdkVersion) { return fmt.Errorf("newer SDK(%v)", ver) } return nil |