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
diff --git a/Android.bp b/Android.bp
index 54b6619..2e0f196 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1255,6 +1255,7 @@
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":conscrypt_public_api_files",
+ ":media2-srcs",
"test-mock/src/**/*.java",
"test-runner/src/**/*.java",
],
@@ -1316,6 +1317,7 @@
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":conscrypt_public_api_files",
+ ":media2-srcs",
],
srcs_lib: "framework",
srcs_lib_whitelist_dirs: frameworks_base_subdirs,
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",
],
}
diff --git a/media/java/android/media/BufferingParams.java b/media/apex/java/android/media/BufferingParams.java
similarity index 100%
rename from media/java/android/media/BufferingParams.java
rename to media/apex/java/android/media/BufferingParams.java
diff --git a/media/java/android/media/CallbackDataSourceDesc.java b/media/apex/java/android/media/CallbackDataSourceDesc.java
similarity index 100%
rename from media/java/android/media/CallbackDataSourceDesc.java
rename to media/apex/java/android/media/CallbackDataSourceDesc.java
diff --git a/media/java/android/media/CloseGuard.java b/media/apex/java/android/media/CloseGuard.java
similarity index 100%
rename from media/java/android/media/CloseGuard.java
rename to media/apex/java/android/media/CloseGuard.java
diff --git a/media/java/android/media/DataSourceCallback.java b/media/apex/java/android/media/DataSourceCallback.java
similarity index 100%
rename from media/java/android/media/DataSourceCallback.java
rename to media/apex/java/android/media/DataSourceCallback.java
diff --git a/media/java/android/media/DataSourceDesc.java b/media/apex/java/android/media/DataSourceDesc.java
similarity index 100%
rename from media/java/android/media/DataSourceDesc.java
rename to media/apex/java/android/media/DataSourceDesc.java
diff --git a/media/java/android/media/FileDataSourceDesc.java b/media/apex/java/android/media/FileDataSourceDesc.java
similarity index 100%
rename from media/java/android/media/FileDataSourceDesc.java
rename to media/apex/java/android/media/FileDataSourceDesc.java
diff --git a/media/java/android/media/Media2HTTPConnection.java b/media/apex/java/android/media/Media2HTTPConnection.java
similarity index 100%
rename from media/java/android/media/Media2HTTPConnection.java
rename to media/apex/java/android/media/Media2HTTPConnection.java
diff --git a/media/java/android/media/Media2HTTPService.java b/media/apex/java/android/media/Media2HTTPService.java
similarity index 100%
rename from media/java/android/media/Media2HTTPService.java
rename to media/apex/java/android/media/Media2HTTPService.java
diff --git a/media/java/android/media/Media2Utils.java b/media/apex/java/android/media/Media2Utils.java
similarity index 100%
rename from media/java/android/media/Media2Utils.java
rename to media/apex/java/android/media/Media2Utils.java
diff --git a/media/java/android/media/MediaPlayer2.java b/media/apex/java/android/media/MediaPlayer2.java
similarity index 100%
rename from media/java/android/media/MediaPlayer2.java
rename to media/apex/java/android/media/MediaPlayer2.java
diff --git a/media/java/android/media/MediaPlayer2Utils.java b/media/apex/java/android/media/MediaPlayer2Utils.java
similarity index 100%
rename from media/java/android/media/MediaPlayer2Utils.java
rename to media/apex/java/android/media/MediaPlayer2Utils.java
diff --git a/media/java/android/media/RoutingDelegate.java b/media/apex/java/android/media/RoutingDelegate.java
similarity index 100%
rename from media/java/android/media/RoutingDelegate.java
rename to media/apex/java/android/media/RoutingDelegate.java
diff --git a/media/java/android/media/UriDataSourceDesc.java b/media/apex/java/android/media/UriDataSourceDesc.java
similarity index 100%
rename from media/java/android/media/UriDataSourceDesc.java
rename to media/apex/java/android/media/UriDataSourceDesc.java
diff --git a/media/java/android/media/VideoSize.java b/media/apex/java/android/media/VideoSize.java
similarity index 100%
rename from media/java/android/media/VideoSize.java
rename to media/apex/java/android/media/VideoSize.java