diff options
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/java/sdk.go b/java/sdk.go index 6ffe399fb..7b79a49f2 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -44,9 +44,6 @@ type sdkContext interface { minSdkVersion() string // targetSdkVersion returns the target_sdk_version property of the current module, or sdkVersion() if it is not set. targetSdkVersion() string - - // Temporarily provide access to the no_frameworks_libs property (where present). - noFrameworkLibs() bool } func sdkVersionOrDefault(ctx android.BaseModuleContext, v string) string { @@ -84,6 +81,7 @@ func sdkVersionToNumberAsString(ctx android.BaseModuleContext, v string) (string func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { v := sdkContext.sdkVersion() + // For PDK builds, use the latest SDK version instead of "current" if ctx.Config().IsPdkBuild() && (v == "" || v == "current") { sdkVersions := ctx.Config().Get(sdkVersionsKey).([]int) @@ -141,9 +139,6 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { useFiles: true, jars: android.Paths{jarPath.Path(), lambdaStubsPath}, aidl: android.OptionalPathForPath(aidlPath.Path()), - - // Pass value straight through for now to match previous behavior. - noFrameworksLibs: sdkContext.noFrameworkLibs(), } } @@ -154,15 +149,12 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { systemModules: m + "_system_modules", frameworkResModule: r, aidl: android.OptionalPathForPath(aidl), - - // Pass value straight through for now to match previous behavior. - noFrameworksLibs: sdkContext.noFrameworkLibs(), } if m == "core.current.stubs" { ret.systemModules = "core-current-stubs-system-modules" - } else if m == "core.platform.api.stubs" { - ret.systemModules = "core-platform-api-stubs-system-modules" + // core_current does not include framework classes. + ret.noFrameworksLibs = true } return ret } @@ -192,9 +184,6 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { return sdkDep{ useDefaultLibs: true, frameworkResModule: "framework-res", - - // Pass value straight through for now to match previous behavior. - noFrameworksLibs: sdkContext.noFrameworkLibs(), } case "none": return sdkDep{ |