summaryrefslogtreecommitdiff
path: root/java/sdk_test.go
diff options
context:
space:
mode:
author Victor Chang <vichang@google.com> 2021-06-29 22:05:58 +0100
committer Victor Chang <vichang@google.com> 2021-06-29 22:05:58 +0100
commitb54f5aa3599196cfed8c32d3e52e1c35b51b8473 (patch)
tree7a50fec9f85daf5608f2237112fe82974a86979a /java/sdk_test.go
parent22fd032ccbe6b8352964fc01d961f0d71b20c949 (diff)
"module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)
Before this fix, compiling a java_library against sdk_version: "module_current" can't use the @SystemApi(MODULE_LIBRARIES) provided by the ART module because the system module "core-current-stubs-system-modules" contains only the public APIs. Use the new system module with module lib APIs. Bug: 183097033 Test: m droid Change-Id: I274e2710d1ff34e896aa620bfafb4481180c53b5
Diffstat (limited to 'java/sdk_test.go')
-rw-r--r--java/sdk_test.go4
1 files changed, 2 insertions, 2 deletions
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",
},