diff options
| author | 2021-03-31 18:17:53 +0900 | |
|---|---|---|
| committer | 2021-04-05 09:32:06 +0900 | |
| commit | 54105c48f4496d7d5dcb3c6a4c6179266dfffc8c (patch) | |
| tree | 17d075458bb3cb113bbe52f601c2ca1322e663af /java/sdk.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/sdk.go')
| -rw-r--r-- | java/sdk.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/sdk.go b/java/sdk.go index b546ca029..f324b7661 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -51,9 +51,9 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe if err != nil { ctx.PropertyErrorf("sdk_version", "%s", err) } - if sdk <= 23 { + if sdk.FinalOrFutureInt() <= 23 { return JAVA_VERSION_7 - } else if sdk <= 29 { + } else if sdk.FinalOrFutureInt() <= 29 { return JAVA_VERSION_8 } else { return JAVA_VERSION_9 @@ -76,11 +76,11 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) } if sdkVersion.UsePrebuilt(ctx) { - dir := filepath.Join("prebuilts", "sdk", sdkVersion.Version.String(), sdkVersion.Kind.String()) + dir := filepath.Join("prebuilts", "sdk", sdkVersion.ApiLevel.String(), sdkVersion.Kind.String()) jar := filepath.Join(dir, "android.jar") // There's no aidl for other SDKs yet. // TODO(77525052): Add aidl files for other SDKs too. - publicDir := filepath.Join("prebuilts", "sdk", sdkVersion.Version.String(), "public") + publicDir := filepath.Join("prebuilts", "sdk", sdkVersion.ApiLevel.String(), "public") aidl := filepath.Join(publicDir, "framework.aidl") jarPath := android.ExistentPathForSource(ctx, jar) aidlPath := android.ExistentPathForSource(ctx, aidl) @@ -89,7 +89,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() { return sdkDep{ invalidVersion: true, - bootclasspath: []string{fmt.Sprintf("sdk_%s_%s_android", sdkVersion.Kind, sdkVersion.Version.String())}, + bootclasspath: []string{fmt.Sprintf("sdk_%s_%s_android", sdkVersion.Kind, sdkVersion.ApiLevel.String())}, } } @@ -105,7 +105,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) var systemModules string if defaultJavaLanguageVersion(ctx, sdkVersion).usesJavaModules() { - systemModules = "sdk_public_" + sdkVersion.Version.String() + "_system_modules" + systemModules = "sdk_public_" + sdkVersion.ApiLevel.String() + "_system_modules" } return sdkDep{ |