summaryrefslogtreecommitdiff
path: root/java/classpath_fragment.go
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2023-03-28 19:17:48 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-03-28 19:17:48 +0000
commit5aade5f52d4d8e39117a4689565dae6ec1abba46 (patch)
tree54fbfdfaba304701cd222cdf77d90a3672e97fb2 /java/classpath_fragment.go
parent9e30ad39ba6d477440e96d40d3dde192246a11c8 (diff)
parenta26eda7f2ced8c5fdef90c7bbdabf740a637e319 (diff)
Merge "Update max_sdk_version from SdkSpec to ApiLevel"
Diffstat (limited to 'java/classpath_fragment.go')
-rw-r--r--java/classpath_fragment.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go
index 45e6175f2..bc9de5043 100644
--- a/java/classpath_fragment.go
+++ b/java/classpath_fragment.go
@@ -136,11 +136,11 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars
jar.minSdkVersion = s.minSdkVersion.String()
}
}
- if s.maxSdkVersion.ApiLevel.Specified() {
- if s.maxSdkVersion.ApiLevel.IsCurrent() {
+ if s.maxSdkVersion.Specified() {
+ if s.maxSdkVersion.IsCurrent() {
jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else {
- jar.maxSdkVersion = s.maxSdkVersion.ApiLevel.String()
+ jar.maxSdkVersion = s.maxSdkVersion.String()
}
}
}