Index: media/base/android/BUILD.gn |
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn |
index 956375b10c541a26249d5047b2ac2c36b796835b..57f35b026ca8131f4f9d42d1c647eb84920661d6 100644 |
--- a/media/base/android/BUILD.gn |
+++ b/media/base/android/BUILD.gn |
@@ -51,10 +51,24 @@ source_set("anywhere_unit_tests") { |
if (is_android) { |
import("//build/config/android/rules.gni") |
+ android_aidl("common_aidl") { |
+ interface_file = "java/src/org/chromium/media/common.aidl" |
+ import_include = "java/src" |
+ sources = [ |
+ "java/src/org/chromium/media/IDialogSurfaceActivityMapper.aidl", |
+ "java/src/org/chromium/media/IDialogSurfaceCallback.aidl", |
+ "java/src/org/chromium/media/IDialogSurfaceHolder.aidl", |
+ "java/src/org/chromium/media/IDialogSurfaceManager.aidl", |
+ ] |
+ } |
+ |
source_set("android") { |
sources = [ |
"android_cdm_factory.cc", |
"android_cdm_factory.h", |
+ "dialog_surface_holder.h", |
+ "dialog_surface_manager.cc", |
+ "dialog_surface_manager.h", |
"media_client_android.cc", |
"media_client_android.h", |
"media_codec_util.cc", |
@@ -86,6 +100,7 @@ if (is_android) { |
"//media:media_implementation", |
] |
deps = [ |
+ ":common_aidl", |
":media_jni_headers", |
"//media:media_features", |
"//media:shared_memory_support", |
@@ -120,6 +135,7 @@ if (is_android) { |
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,12 +147,17 @@ if (is_android) { |
android_library("media_java") { |
deps = [ |
+ ":common_aidl", |
"//base:base_java", |
] |
+ 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/DialogSurfaceManagerImpl.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", |