diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/base.go | 2 | ||||
| -rw-r--r-- | java/sdk.go | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/java/base.go b/java/base.go index 1bcff2ed5..991132321 100644 --- a/java/base.go +++ b/java/base.go @@ -1923,7 +1923,7 @@ type moduleWithSdkDep interface { func (m *Module) getSdkLinkType(ctx android.BaseModuleContext, name string) (ret sdkLinkType, stubs bool) { switch name { - case "core.current.stubs", "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs", + case android.SdkCore.JavaLibraryName(ctx.Config()), "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs", "stub-annotations", "private-stub-annotations-jar", "core-lambda-stubs", "core-generated-annotation-stubs": return javaCore, true diff --git a/java/sdk.go b/java/sdk.go index 72a50067c..1b18ba40a 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -148,10 +148,11 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) toModule := func(module string, aidl android.Path) sdkDep { // Select the kind of system modules needed for the sdk version. systemModulesKind := systemModuleKind(sdkVersion.Kind, android.FutureApiLevel) + systemModules := android.JavaApiLibraryName(ctx.Config(), fmt.Sprintf("core-%s-stubs-system-modules", systemModulesKind)) return sdkDep{ useModule: true, bootclasspath: []string{module, config.DefaultLambdaStubsLibrary}, - systemModules: fmt.Sprintf("core-%s-stubs-system-modules", systemModulesKind), + systemModules: systemModules, java9Classpath: []string{module}, frameworkResModule: "framework-res", aidl: android.OptionalPathForPath(aidl), @@ -196,8 +197,8 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) case android.SdkCore: return sdkDep{ useModule: true, - bootclasspath: []string{"core.current.stubs", config.DefaultLambdaStubsLibrary}, - systemModules: "core-public-stubs-system-modules", + bootclasspath: []string{android.SdkCore.JavaLibraryName(ctx.Config()), config.DefaultLambdaStubsLibrary}, + systemModules: android.JavaApiLibraryName(ctx.Config(), "core-public-stubs-system-modules"), noFrameworksLibs: true, } case android.SdkModule: |