diff options
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/java/java_test.go b/java/java_test.go index 76244f04b..2de27782a 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -124,6 +124,7 @@ func testContext(config android.Config, bp string, "android_system_stubs_current", "android_test_stubs_current", "core.current.stubs", + "core.platform.api.stubs", "kotlin-stdlib", } @@ -134,7 +135,7 @@ func testContext(config android.Config, bp string, srcs: ["a.java"], no_standard_libs: true, sdk_version: "core_current", - system_modules: "core-system-modules", + system_modules: "core-platform-api-stubs-system-modules", } `, extra) } @@ -148,6 +149,7 @@ func testContext(config android.Config, bp string, systemModules := []string{ "core-system-modules", + "core-platform-api-stubs-system-modules", "android_stubs_current_system_modules", "android_system_stubs_current_system_modules", "android_test_stubs_current_system_modules", @@ -367,15 +369,15 @@ var classpathTestcases = []struct { }{ { name: "default", - bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"}, - system: "core-system-modules", + bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, + system: "core-platform-api-stubs-system-modules", classpath: []string{"ext", "framework"}, }, { name: "blank sdk version", properties: `sdk_version: "",`, - bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"}, - system: "core-system-modules", + bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, + system: "core-platform-api-stubs-system-modules", classpath: []string{"ext", "framework"}, }, { @@ -433,8 +435,8 @@ var classpathTestcases = []struct { { name: "nostdlib system_modules", - properties: `no_standard_libs: true, system_modules: "core-system-modules"`, - system: "core-system-modules", + properties: `no_standard_libs: true, system_modules: "core-platform-api-stubs-system-modules"`, + system: "core-platform-api-stubs-system-modules", bootclasspath: []string{`""`}, classpath: []string{}, }, |