Separate updatable-media library
Test: build
Change-Id: If83855f36a7ed8bb7675e43c7c789fc9cc2b6923
diff --git a/Android.bp b/Android.bp
index 5f0528c..68fd98c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,7 +49,7 @@
"rs/java/**/*.java",
":framework-javastream-protos",
- // TODO: Remove this after introduce corresponding srcs under media/java/
+ // TODO: Resolve circular library dependency and remove media1-srcs and mediasession2-srcs
":media1-srcs",
":mediasession2-srcs",
@@ -1266,9 +1266,7 @@
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":conscrypt_public_api_files",
- ":media1-stubs-srcs",
- ":mediasession2-stubs-srcs",
- ":mediaplayer2-srcs",
+ ":media-srcs-without-aidls",
"test-mock/src/**/*.java",
"test-runner/src/**/*.java",
],
@@ -1330,9 +1328,7 @@
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":conscrypt_public_api_files",
- ":media1-stubs-srcs",
- ":mediasession2-stubs-srcs",
- ":mediaplayer2-srcs",
+ ":media-srcs-without-aidls",
],
srcs_lib: "framework",
srcs_lib_whitelist_dirs: frameworks_base_subdirs,
diff --git a/media/Android.bp b/media/Android.bp
index 33d7c2e..88ed9c6a 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -1,22 +1,17 @@
java_library {
- name: "updatable-media",
+ name: "updatable-media1",
srcs: [
":media1-srcs",
- ":mediasession2-srcs",
- ":mediaplayer2-srcs",
":framework-media-annotation-srcs",
],
- static_libs: [
- "mediaplayer2-protos",
- ],
-
aidl: {
export_include_dirs: [
"apex/java",
],
+ // TODO: find out a way to include only the necessary aidl files instead of dirs.
include_dirs: [
"frameworks/base/core/java",
"frameworks/base/media/java",
@@ -29,6 +24,58 @@
sdk_version: "system_current",
}
+java_library {
+ name: "updatable-mediasession2",
+
+ srcs: [
+ ":mediasession2-srcs",
+ ":framework-media-annotation-srcs",
+ ],
+
+ aidl: {
+ export_include_dirs: [
+ "apex/java",
+ ],
+
+ // TODO: find out a way to include only the necessary aidl files instead of dirs.
+ include_dirs: [
+ "frameworks/base/core/java",
+ ],
+ },
+
+ installable: true,
+
+ // Make sure that the implementaion only relies on SDK or system APIs.
+ sdk_version: "system_current",
+}
+
+java_library {
+ name: "updatable-media",
+
+ srcs: [
+ ":mediaplayer2-srcs",
+ ":framework-media-annotation-srcs",
+ ],
+
+ static_libs: [
+ "mediaplayer2-protos",
+ ],
+
+ installable: true,
+
+ // Make sure that the implementaion only relies on SDK or system APIs.
+ sdk_version: "system_current",
+}
+
+filegroup {
+ name: "media-srcs-without-aidls",
+ srcs : [
+ ":media1-srcs-without-aidls",
+ ":mediasession2-srcs-without-aidls",
+ ":mediaplayer2-srcs",
+ ],
+}
+
filegroup {
name: "media1-srcs",
srcs: [
@@ -56,7 +103,7 @@
}
filegroup {
- name: "media1-stubs-srcs",
+ name: "media1-srcs-without-aidls",
srcs: [
":media1-srcs",
],
@@ -90,7 +137,7 @@
}
filegroup {
- name: "mediasession2-stubs-srcs",
+ name: "mediasession2-srcs-without-aidls",
srcs: [
":mediasession2-srcs",
],