diff options
| author | 2023-03-03 21:20:36 +0000 | |
|---|---|---|
| committer | 2023-03-22 20:15:45 +0000 | |
| commit | 8c9ae7ed6770b45f1337722a2e61cb22317659aa (patch) | |
| tree | 2d1b882fed5c5a6291ae685cbd268ed1c8c17bc0 /java/classpath_fragment.go | |
| parent | 7947b31a5577c3bb6dbcffb808dc8f71904249c5 (diff) | |
Update min_sdk_version from SdkSpec to ApiLevel
This relands aosp/2457063. The original change broke T and U since those
branches still contain soong modules of type (kind+level). Those soong
modules have been cleaned up now
Test: Used go/abtd to test T and U branches with this change
Bug: 208456999
Change-Id: I0ef7933c055f88cb512a02108f1173e51156ef1c
Diffstat (limited to 'java/classpath_fragment.go')
| -rw-r--r-- | java/classpath_fragment.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index cf81ddb5d..45e6175f2 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -130,13 +130,13 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars if s, ok := m.(*SdkLibrary); ok { // 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() { + if s.minSdkVersion.IsCurrent() { jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() } else { - jar.minSdkVersion = s.minSdkVersion.ApiLevel.String() + jar.minSdkVersion = s.minSdkVersion.String() } } - if s.maxSdkVersion.Specified() { + if s.maxSdkVersion.ApiLevel.Specified() { if s.maxSdkVersion.ApiLevel.IsCurrent() { jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() } else { |