diff options
| -rw-r--r-- | java/sdk.go | 18 | ||||
| -rw-r--r-- | java/sdk_test.go | 4 | ||||
| -rw-r--r-- | java/testing.go | 1 |
3 files changed, 19 insertions, 4 deletions
diff --git a/java/sdk.go b/java/sdk.go index cbd873d33..d1b899e48 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -175,10 +175,24 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) } case android.SdkModule: // TODO(146757305): provide .apk and .aidl that have more APIs for modules - return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", nonUpdatableFrameworkAidlPath(ctx)) + return sdkDep{ + useModule: true, + bootclasspath: []string{"android_module_lib_stubs_current", config.DefaultLambdaStubsLibrary}, + systemModules: "core-module-lib-stubs-system-modules", + java9Classpath: []string{"android_module_lib_stubs_current"}, + frameworkResModule: "framework-res", + aidl: android.OptionalPathForPath(nonUpdatableFrameworkAidlPath(ctx)), + } case android.SdkSystemServer: // TODO(146757305): provide .apk and .aidl that have more APIs for modules - return toModule([]string{"android_system_server_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx)) + return sdkDep{ + useModule: true, + bootclasspath: []string{"android_system_server_stubs_current", config.DefaultLambdaStubsLibrary}, + systemModules: "core-module-lib-stubs-system-modules", + java9Classpath: []string{"android_system_server_stubs_current"}, + frameworkResModule: "framework-res", + aidl: android.OptionalPathForPath(sdkFrameworkAidlPath(ctx)), + } default: panic(fmt.Errorf("invalid sdk %q", sdkVersion.Raw)) } diff --git a/java/sdk_test.go b/java/sdk_test.go index 2b1846592..bb595a54e 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -219,7 +219,7 @@ func TestClasspath(t *testing.T) { name: "module_current", properties: `sdk_version: "module_current",`, bootclasspath: []string{"android_module_lib_stubs_current", "core-lambda-stubs"}, - system: "core-current-stubs-system-modules", + system: "core-module-lib-stubs-system-modules", java9classpath: []string{"android_module_lib_stubs_current"}, aidl: "-pout/soong/framework_non_updatable.aidl", }, @@ -227,7 +227,7 @@ func TestClasspath(t *testing.T) { name: "system_server_current", properties: `sdk_version: "system_server_current",`, bootclasspath: []string{"android_system_server_stubs_current", "core-lambda-stubs"}, - system: "core-current-stubs-system-modules", + system: "core-module-lib-stubs-system-modules", java9classpath: []string{"android_system_server_stubs_current"}, aidl: "-pout/soong/framework.aidl", }, diff --git a/java/testing.go b/java/testing.go index c3803c8d4..e2ff5cd12 100644 --- a/java/testing.go +++ b/java/testing.go @@ -312,6 +312,7 @@ func gatherRequiredDepsForTest() string { systemModules := []string{ "core-current-stubs-system-modules", + "core-module-lib-stubs-system-modules", "legacy-core-platform-api-stubs-system-modules", "stable-core-platform-api-stubs-system-modules", } |