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

Add updatable_media_stubs to prevent private API use.

Browse Source 
Bug: 123551910, Bug: 123253805
Test: build
Change-Id: Id46ff05fa01db726d613ee2299b0c27921c88aae
This commit is contained in:
Insun Kang
2019-01-24 20:46:28 +09:00
committed by Dongwon Kang
parent d8eb4b62cb
commit 234338609b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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"} DefaultLibraries = []string{"ext", "framework", "updatable_media_stubs"}
DefaultLambdaStubsLibrary = "core-lambda-stubs" DefaultLambdaStubsLibrary = "core-lambda-stubs"
SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar" SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar"
@@ -43,6 +43,7 @@ var (
"android.car7", "android.car7",
"core-oj", "core-oj",
"core-libart", "core-libart",
"updatable-media",
} }
ManifestMergerClasspath = []string{ ManifestMergerClasspath = []string{

3
java/java_test.go
View File

@@ -117,6 +117,7 @@ func testContext(config android.Config, bp string,
"core-lambda-stubs", "core-lambda-stubs",
"framework", "framework",
"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",
@@ -955,7 +956,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")}, ":") expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework"), moduleToPath("updatable_media_stubs")}, ":")
checkPatchModuleFlag(t, ctx, "baz", expected) checkPatchModuleFlag(t, ctx, "baz", expected)
}) })
} }

4
java/sdk_test.go
View File

@@ -39,14 +39,14 @@ var classpathTestcases = []struct {
name: "default", name: "default",
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-platform-api-stubs-system-modules", system: "core-platform-api-stubs-system-modules",
classpath: []string{"ext", "framework"}, classpath: []string{"ext", "framework", "updatable_media_stubs"},
}, },
{ {
name: "blank sdk version", name: "blank sdk version",
properties: `sdk_version: "",`, properties: `sdk_version: "",`,
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-platform-api-stubs-system-modules", system: "core-platform-api-stubs-system-modules",
classpath: []string{"ext", "framework"}, classpath: []string{"ext", "framework", "updatable_media_stubs"},
}, },
{ {