diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 3 | ||||
| -rw-r--r-- | java/java_test.go | 2 | ||||
| -rw-r--r-- | java/sdk_test.go | 4 | ||||
| -rw-r--r-- | java/testing.go | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/java/config/config.go b/java/config/config.go index 3452a1db6..1be184998 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -29,7 +29,7 @@ var ( DefaultBootclasspathLibraries = []string{"core.platform.api.stubs", "core-lambda-stubs"} DefaultSystemModules = "core-platform-api-stubs-system-modules" - DefaultLibraries = []string{"ext", "framework"} + DefaultLibraries = []string{"ext", "framework", "updatable_media_stubs"} DefaultLambdaStubsLibrary = "core-lambda-stubs" SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar" @@ -44,6 +44,7 @@ var ( "conscrypt", "core-oj", "core-libart", + "updatable-media", } ) diff --git a/java/java_test.go b/java/java_test.go index 6cb481865..ec4c100f9 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -917,7 +917,7 @@ func TestPatchModule(t *testing.T) { checkPatchModuleFlag(t, ctx, "foo", "") expected := "java.base=.:" + buildDir checkPatchModuleFlag(t, ctx, "bar", expected) - expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework")}, ":") + expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework"), moduleToPath("updatable_media_stubs")}, ":") checkPatchModuleFlag(t, ctx, "baz", expected) }) } diff --git a/java/sdk_test.go b/java/sdk_test.go index 6924e2654..a11ea2f7f 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -39,14 +39,14 @@ var classpathTestcases = []struct { name: "default", bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, system: "core-platform-api-stubs-system-modules", - classpath: []string{"ext", "framework"}, + classpath: []string{"ext", "framework", "updatable_media_stubs"}, }, { name: "blank sdk version", properties: `sdk_version: "",`, bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, system: "core-platform-api-stubs-system-modules", - classpath: []string{"ext", "framework"}, + classpath: []string{"ext", "framework", "updatable_media_stubs"}, }, { diff --git a/java/testing.go b/java/testing.go index 6febfa1d3..713eca1a3 100644 --- a/java/testing.go +++ b/java/testing.go @@ -40,6 +40,7 @@ func GatherRequiredDepsForTest() string { "core-lambda-stubs", "framework", "ext", + "updatable_media_stubs", "android_stubs_current", "android_system_stubs_current", "android_test_stubs_current", |