diff options
| author | 2021-11-03 15:32:42 +0000 | |
|---|---|---|
| committer | 2021-11-03 15:32:42 +0000 | |
| commit | 8380ee66a590e468daa5efe2855c46c57e4eed84 (patch) | |
| tree | 3b5551d3b50a7653ca669c314ede83887624e47e /java/sdk_test.go | |
| parent | 5506c1658c654c8d97c6e7f41116678384e2e50b (diff) | |
| parent | 004547facd2b7d95cbd757a7bb076ac1c1b82ab9 (diff) | |
Merge "Use module-lib system modules when building from prebuilts"
Diffstat (limited to 'java/sdk_test.go')
| -rw-r--r-- | java/sdk_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go index 9a711922c..5c4a6d244 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -304,7 +304,7 @@ func TestClasspath(t *testing.T) { name: "module_current", properties: `sdk_version: "module_current",`, bootclasspath: []string{`""`}, - system: "sdk_public_current_system_modules", + system: "sdk_module-lib_current_system_modules", java8classpath: []string{"prebuilts/sdk/current/module-lib/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, java9classpath: []string{"prebuilts/sdk/current/module-lib/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, aidl: "-pprebuilts/sdk/current/public/framework.aidl", @@ -331,7 +331,7 @@ func TestClasspath(t *testing.T) { name: "module_32", properties: `sdk_version: "module_32",`, bootclasspath: []string{`""`}, - system: "sdk_public_32_system_modules", + system: "sdk_module-lib_32_system_modules", java8classpath: []string{"prebuilts/sdk/32/module-lib/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, java9classpath: []string{"prebuilts/sdk/32/module-lib/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, aidl: "-pprebuilts/sdk/32/public/framework.aidl", @@ -354,7 +354,7 @@ func TestClasspath(t *testing.T) { name: "system_server_current", properties: `sdk_version: "system_server_current",`, bootclasspath: []string{`""`}, - system: "sdk_public_current_system_modules", + system: "sdk_module-lib_current_system_modules", java8classpath: []string{"prebuilts/sdk/current/system-server/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, java9classpath: []string{"prebuilts/sdk/current/system-server/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, aidl: "-pprebuilts/sdk/current/public/framework.aidl", @@ -381,7 +381,7 @@ func TestClasspath(t *testing.T) { name: "system_server_32", properties: `sdk_version: "system_server_32",`, bootclasspath: []string{`""`}, - system: "sdk_public_32_system_modules", + system: "sdk_module-lib_32_system_modules", java8classpath: []string{"prebuilts/sdk/32/system-server/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, java9classpath: []string{"prebuilts/sdk/32/system-server/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, aidl: "-pprebuilts/sdk/32/public/framework.aidl", |