summaryrefslogtreecommitdiff
path: root/java/classpath_fragment.go
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2022-08-16 19:08:20 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-08-16 19:08:20 +0000
commit6ef4fae22995b4ad74b1607272bd221025ea367c (patch)
tree7b4d0c3be15b9a112cd4779ea0a9f8ece4ea118a /java/classpath_fragment.go
parentae7fe1697cee2638435522c6436e59d84661c699 (diff)
parent2822186571d46c970f00f720fd08c28830e62c8d (diff)
Merge "DO NOT MERGE - Merge Android 13"
Diffstat (limited to 'java/classpath_fragment.go')
-rw-r--r--java/classpath_fragment.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go
index ca2752877..259e977d8 100644
--- a/java/classpath_fragment.go
+++ b/java/classpath_fragment.go
@@ -131,14 +131,14 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars
// TODO(208456999): instead of mapping "current" to latest, min_sdk_version should never be set to "current"
if s.minSdkVersion.Specified() {
if s.minSdkVersion.ApiLevel.IsCurrent() {
- jar.minSdkVersion = ctx.Config().LatestPreviewApiLevel().String()
+ jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else {
jar.minSdkVersion = s.minSdkVersion.ApiLevel.String()
}
}
if s.maxSdkVersion.Specified() {
if s.maxSdkVersion.ApiLevel.IsCurrent() {
- jar.maxSdkVersion = ctx.Config().LatestPreviewApiLevel().String()
+ jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else {
jar.maxSdkVersion = s.maxSdkVersion.ApiLevel.String()
}