aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/config/config.go3
-rw-r--r--java/java_test.go2
-rw-r--r--java/testing.go1
3 files changed, 4 insertions, 2 deletions
diff --git a/java/config/config.go b/java/config/config.go
index 46cd361d7..7f968bcc6 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 53df6f486..c17b659e4 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -1023,7 +1023,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/testing.go b/java/testing.go
index 1be3768b5..6b35bd040 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -38,6 +38,7 @@ func GatherRequiredDepsForTest() string {
extraModules := []string{
"core-lambda-stubs",
"ext",
+ "updatable_media_stubs",
"android_stubs_current",
"android_system_stubs_current",
"android_test_stubs_current",