Add build rule for media2-abi-*
- media2-abi-* included in updatable-media.jar
- Moves the media2-abi files into media/apex
- Resolves a hidden api usage
Bug: 123209084
Test: build
Change-Id: I9f9b0b9c288da5c7acbfedcb56867ff405ac0d61
diff --git a/media/Android.bp b/media/Android.bp
index 0eb86ac..91e14c7 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -15,11 +15,43 @@
],
}
+filegroup {
+ name: "mediasession2-srcs",
+ srcs: [
+ "apex/java/android/media/Controller2Link.java",
+ "apex/java/android/media/IMediaController2.aidl",
+ "apex/java/android/media/IMediaSession2.aidl",
+ "apex/java/android/media/IMediaSession2Service.aidl",
+ "apex/java/android/media/MediaConstants.java",
+ "apex/java/android/media/MediaController2.java",
+ "apex/java/android/media/MediaItem2.java",
+ "apex/java/android/media/MediaSession2.java",
+ "apex/java/android/media/MediaSession2Service.java",
+ "apex/java/android/media/Session2Command.java",
+ "apex/java/android/media/Session2CommandGroup.java",
+ "apex/java/android/media/Session2Link.java",
+ "apex/java/android/media/Session2Token.java",
+ ],
+}
+
+filegroup {
+ name: "mediasession2-stubs-srcs",
+ srcs: [
+ ":mediasession2-srcs",
+ ],
+ exclude_srcs: [
+ "apex/java/android/media/IMediaController2.aidl",
+ "apex/java/android/media/IMediaSession2.aidl",
+ "apex/java/android/media/IMediaSession2Service.aidl",
+ ],
+}
+
java_library {
name: "updatable-media",
srcs: [
- ":media2-srcs",
+ ":mediasession2-srcs",
+ ":mediaplayer2-srcs",
":framework-media-annotation-srcs",
],
@@ -27,6 +59,16 @@
"mediaplayer2-protos",
],
+ aidl: {
+ export_include_dirs: [
+ "apex/java",
+ ],
+
+ include_dirs: [
+ "frameworks/base/core/java",
+ ],
+ },
+
installable: true,
// Make sure that the implementaion only relies on SDK or system APIs.
@@ -34,7 +76,7 @@
}
filegroup {
- name: "media2-srcs",
+ name: "mediaplayer2-srcs",
srcs: [
"apex/java/android/media/CloseGuard.java",
"apex/java/android/media/DataSourceCallback.java",