Add updatable_media_stub to framework
The module framework is now a build-only library whose purpose is to
provide hidden APIs from the non-updatable part of the platform and APIs
from the modules. Merging updatable_media_stub to framework, like the
stub libraries from other modules.
As a result, updatable_media_stub can be removed from DefaultLibraries.
Bug: N/A
Test: m
Exempt-From-Owner-Approval: cherry-pick from internal
Merged-In: I7f80716119ad6ac627e5666def9fe17112dcde3b
(cherry picked from commit 4c258d282b
)
Change-Id: I7f80716119ad6ac627e5666def9fe17112dcde3b
This commit is contained in:
parent
572aeed6a4
commit
231d056d50
|
@ -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", "updatable_media_stubs"}
|
||||
DefaultLibraries = []string{"ext", "framework"}
|
||||
DefaultLambdaStubsLibrary = "core-lambda-stubs"
|
||||
SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar"
|
||||
|
||||
|
|
|
@ -1347,7 +1347,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"), moduleToPath("updatable_media_stubs")}, ":")
|
||||
expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework")}, ":")
|
||||
checkPatchModuleFlag(t, ctx, "baz", expected)
|
||||
})
|
||||
}
|
||||
|
|
|
@ -38,7 +38,6 @@ func GatherRequiredDepsForTest() string {
|
|||
extraModules := []string{
|
||||
"core-lambda-stubs",
|
||||
"ext",
|
||||
"updatable_media_stubs",
|
||||
"android_stubs_current",
|
||||
"android_system_stubs_current",
|
||||
"android_test_stubs_current",
|
||||
|
|
Loading…
Reference in New Issue