Index: media/base/android/BUILD.gn |
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn |
index bc89ae0a591dce0feead4374c589ba8890b8b4de..d014b894b13fd05422273943b266ec3277cf32e9 100644 |
--- a/media/base/android/BUILD.gn |
+++ b/media/base/android/BUILD.gn |
@@ -10,6 +10,17 @@ import("//media/media_options.gni") |
assert(is_android) |
+android_aidl("common_aidl") { |
+ interface_file = "java/src/org/chromium/media/common.aidl" |
+ import_include = "java/src" |
+ sources = [ |
+ "java/src/org/chromium/media/IDialogSurface.aidl", |
+ "java/src/org/chromium/media/IDialogSurfaceActivityMapper.aidl", |
+ "java/src/org/chromium/media/IDialogSurfaceCallback.aidl", |
+ "java/src/org/chromium/media/IDialogSurfaceManager.aidl", |
+ ] |
+} |
+ |
source_set("android") { |
sources = [ |
"access_unit_queue.cc", |
@@ -23,6 +34,9 @@ source_set("android") { |
"demuxer_android.h", |
"demuxer_stream_player_params.cc", |
"demuxer_stream_player_params.h", |
+ "dialog_surface.h", |
+ "dialog_surface_manager.cc", |
+ "dialog_surface_manager.h", |
"media_client_android.cc", |
"media_client_android.h", |
"media_codec_bridge.cc", |
@@ -119,6 +133,7 @@ generate_jni("media_jni_headers") { |
sources = [ |
"java/src/org/chromium/media/AudioManagerAndroid.java", |
"java/src/org/chromium/media/AudioRecordInput.java", |
+ "java/src/org/chromium/media/DialogSurfaceManagerWrapper.java", |
"java/src/org/chromium/media/MediaCodecBridge.java", |
"java/src/org/chromium/media/MediaCodecUtil.java", |
"java/src/org/chromium/media/MediaDrmBridge.java", |
@@ -131,11 +146,16 @@ generate_jni("media_jni_headers") { |
android_library("media_java") { |
deps = [ |
"//base:base_java", |
+ "//media/base/android:common_aidl", |
] |
+ srcjar_deps = [ ":common_aidl" ] |
+ |
java_files = [ |
"java/src/org/chromium/media/AudioManagerAndroid.java", |
"java/src/org/chromium/media/AudioRecordInput.java", |
+ "java/src/org/chromium/media/DialogSurfaceManager.java", |
+ "java/src/org/chromium/media/DialogSurfaceManagerWrapper.java", |
"java/src/org/chromium/media/MediaCodecBridge.java", |
"java/src/org/chromium/media/MediaCodecUtil.java", |
"java/src/org/chromium/media/MediaDrmBridge.java", |