Add updatable_media_stubs to prevent private API use.
Bug: 123551910, Bug: 123253805 Test: build Change-Id: Id46ff05fa01db726d613ee2299b0c27921c88aae
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -43,6 +43,7 @@ var (
|
||||
"android.car7",
|
||||
"core-oj",
|
||||
"core-libart",
|
||||
"updatable-media",
|
||||
}
|
||||
|
||||
ManifestMergerClasspath = []string{
|
||||
|
@@ -117,6 +117,7 @@ func testContext(config android.Config, bp string,
|
||||
"core-lambda-stubs",
|
||||
"framework",
|
||||
"ext",
|
||||
"updatable_media_stubs",
|
||||
"android_stubs_current",
|
||||
"android_system_stubs_current",
|
||||
"android_test_stubs_current",
|
||||
@@ -955,7 +956,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)
|
||||
})
|
||||
}
|
||||
|
@@ -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"},
|
||||
},
|
||||
{
|
||||
|
||||
|
Reference in New Issue
Block a user