commit 8afd5319b00c6a9e9bd3630a31ac302cc2730fbc
author Dongwon Kang <dwkang@google.com> Tue Jan 15 20:04:51 2019 -0800
committer Dongwon Kang <dwkang@google.com> Thu Jan 17 13:33:58 2019 -0800
tree 4d1924991bbc20febb583b7763a2f921a6b781a7
parent 51d414796f7e6c9c0beead6d6a75d511cb9914ca

Separate out mediaplayer2 code from framework

"media2.jar" is renamed to "updatable-media.jar" in order to
show its purpose clearly.

Test: build & boot & MediaPlayer2Test
Bug: 112766913
Change-Id: Ia2ea05e0ed1a8bb2cfea20c9e2585e3d3cbfffd9

media/Android.bp

diff --git a/media/Android.bp b/media/Android.bp
index 8ebc91a..0c4ce0e 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -16,8 +16,8 @@
 }
 
 java_library {
-    // TODO: include media2.jar in the media apex and add it to the bootclasspath.
-    name: "media2",
+    // TODO: include updatable-media.jar in the media apex and add it to the bootclasspath.
+    name: "updatable-media",
 
     srcs: [
         ":media2-srcs",
@@ -28,6 +28,8 @@
         "mediaplayer2-protos",
     ],
 
+    installable: true,
+
     // Make sure that the implementaion only relies on SDK or system APIs.
     sdk_version: "system_current",
 }
@@ -35,19 +37,19 @@
 filegroup {
     name: "media2-srcs",
     srcs: [
-        "java/android/media/CloseGuard.java",
-        "java/android/media/DataSourceCallback.java",
-        "java/android/media/DataSourceDesc.java",
-        "java/android/media/UriDataSourceDesc.java",
-        "java/android/media/FileDataSourceDesc.java",
-        "java/android/media/CallbackDataSourceDesc.java",
-        "java/android/media/VideoSize.java",
-        "java/android/media/Media2Utils.java",
-        "java/android/media/MediaPlayer2Utils.java",
-        "java/android/media/MediaPlayer2.java",
-        "java/android/media/Media2HTTPService.java",
-        "java/android/media/Media2HTTPConnection.java",
-        "java/android/media/RoutingDelegate.java",
-        "java/android/media/BufferingParams.java",
+        "apex/java/android/media/CloseGuard.java",
+        "apex/java/android/media/DataSourceCallback.java",
+        "apex/java/android/media/DataSourceDesc.java",
+        "apex/java/android/media/UriDataSourceDesc.java",
+        "apex/java/android/media/FileDataSourceDesc.java",
+        "apex/java/android/media/CallbackDataSourceDesc.java",
+        "apex/java/android/media/VideoSize.java",
+        "apex/java/android/media/Media2Utils.java",
+        "apex/java/android/media/MediaPlayer2Utils.java",
+        "apex/java/android/media/MediaPlayer2.java",
+        "apex/java/android/media/Media2HTTPService.java",
+        "apex/java/android/media/Media2HTTPConnection.java",
+        "apex/java/android/media/RoutingDelegate.java",
+        "apex/java/android/media/BufferingParams.java",
     ],
 }