diff options
author | Jiyong Park <jiyong@google.com> | 2021-03-31 18:17:53 +0900 |
---|---|---|
committer | Jiyong Park <jiyong@google.com> | 2021-04-05 09:32:06 +0900 |
commit | 54105c48f4496d7d5dcb3c6a4c6179266dfffc8c (patch) | |
tree | 17d075458bb3cb113bbe52f601c2ca1322e663af /java/java.go | |
parent | 0774773a65c2b4164c725ca00b5fad88048f6259 (diff) |
SdkSpec = Scope + ApiLevel
SdkSpec.Version was an int type. Now it becomes ApiLevel type which
is a better abstraction of the version (or api level).
Bug: 1655587
Test: m
Change-Id: I4d67b9b9eae45f653b6af4f5b73da9e091b3dfab
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 |