StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add updatable_media_stub to framework"

Browse Source
This commit is contained in:
Jiyong Park
2019-12-19 18:04:54 +00:00
committed by Gerrit Code Review
parent 18577fe8fb 231d056d50
commit f3273c5587
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/config/config.go
View File

@@ -29,7 +29,7 @@ var (
DefaultBootclasspathLibraries = []string{"core.platform.api.stubs", "core-lambda-stubs"} DefaultBootclasspathLibraries = []string{"core.platform.api.stubs", "core-lambda-stubs"}
DefaultSystemModules = "core-platform-api-stubs-system-modules" DefaultSystemModules = "core-platform-api-stubs-system-modules"
DefaultLibraries = []string{"ext", "framework", "updatable_media_stubs"} DefaultLibraries = []string{"ext", "framework"}
DefaultLambdaStubsLibrary = "core-lambda-stubs" DefaultLambdaStubsLibrary = "core-lambda-stubs"
SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar" SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar"

2
java/java_test.go
View File

@@ -1227,7 +1227,7 @@ func TestPatchModule(t *testing.T) {
checkPatchModuleFlag(t, ctx, "foo", "") checkPatchModuleFlag(t, ctx, "foo", "")
expected := "java.base=.:" + buildDir expected := "java.base=.:" + buildDir
checkPatchModuleFlag(t, ctx, "bar", expected) checkPatchModuleFlag(t, ctx, "bar", expected)
expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework"), moduleToPath("updatable_media_stubs")}, ":") expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework")}, ":")
checkPatchModuleFlag(t, ctx, "baz", expected) checkPatchModuleFlag(t, ctx, "baz", expected)
}) })
} }

1
java/testing.go
View File

@@ -138,7 +138,6 @@ func GatherRequiredDepsForTest() string {
extraModules := []string{ extraModules := []string{
"core-lambda-stubs", "core-lambda-stubs",
"ext", "ext",
"updatable_media_stubs",
"android_stubs_current", "android_stubs_current",
"android_system_stubs_current", "android_system_stubs_current",
"android_test_stubs_current", "android_test_stubs_current",