diff options
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/sdk.go b/java/sdk.go index 6f0f432b3..66eb284ba 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -58,7 +58,7 @@ func sdkVersionOrDefault(ctx android.BaseModuleContext, v string) string { // Returns a sdk version as a number. For modules targeting an unreleased SDK (meaning it does not yet have a number) // it returns android.FutureApiLevel (10000). -func sdkVersionToNumber(ctx android.BaseModuleContext, v string) (int, error) { +func sdkVersionToNumber(ctx android.EarlyModuleContext, v string) (int, error) { switch v { case "", "none", "current", "test_current", "system_current", "core_current", "core_platform": return ctx.Config().DefaultAppTargetSdkInt(), nil @@ -72,7 +72,7 @@ func sdkVersionToNumber(ctx android.BaseModuleContext, v string) (int, error) { } } -func sdkVersionToNumberAsString(ctx android.BaseModuleContext, v string) (string, error) { +func sdkVersionToNumberAsString(ctx android.EarlyModuleContext, v string) (string, error) { n, err := sdkVersionToNumber(ctx, v) if err != nil { return "", err @@ -80,7 +80,7 @@ func sdkVersionToNumberAsString(ctx android.BaseModuleContext, v string) (string return strconv.Itoa(n), nil } -func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { +func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep { v := sdkContext.sdkVersion() // For PDK builds, use the latest SDK version instead of "current" @@ -127,12 +127,12 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { } if !jarPath.Valid() { - ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, jar) + ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", sdk, jar) return sdkDep{} } if !aidlPath.Valid() { - ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, aidl) + ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", sdk, aidl) return sdkDep{} } |