From 4c258d282b15bd0d9ba3de8dfa9762de1bd1adf4 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 18 Dec 2019 17:28:17 +0900 Subject: [PATCH] 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 Change-Id: I7f80716119ad6ac627e5666def9fe17112dcde3b --- java/config/config.go | 2 +- java/java_test.go | 2 +- java/testing.go | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/config/config.go b/java/config/config.go index 0180f45ce..8443693a5 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", "updatable_media_stubs"} + DefaultLibraries = []string{"ext", "framework"} DefaultLambdaStubsLibrary = "core-lambda-stubs" SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar" diff --git a/java/java_test.go b/java/java_test.go index 4a549e6c8..66368780e 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -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) }) } diff --git a/java/testing.go b/java/testing.go index acbefb92c..11f3976b1 100644 --- a/java/testing.go +++ b/java/testing.go @@ -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",