| Index: media/base/android/BUILD.gn
|
| diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
|
| index 71ce7be9ff8e395dccf7518f62ee3f4905c734f7..8595f287a1d8e32048f74a0ceac209b815e8250b 100644
|
| --- a/media/base/android/BUILD.gn
|
| +++ b/media/base/android/BUILD.gn
|
| @@ -51,10 +51,26 @@ 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/IDialogSurface.aidl",
|
| + "java/src/org/chromium/media/IDialogSurfaceCallback.aidl",
|
| + "java/src/org/chromium/media/IDialogSurfaceManager.aidl",
|
| + ]
|
| + }
|
| +
|
| source_set("android") {
|
| sources = [
|
| "android_cdm_factory.cc",
|
| "android_cdm_factory.h",
|
| + "dialog_surface.cc",
|
| + "dialog_surface.h",
|
| + "dialog_surface_callback.cc",
|
| + "dialog_surface_callback.h",
|
| + "dialog_surface_manager.cc",
|
| + "dialog_surface_manager.h",
|
| "media_client_android.cc",
|
| "media_client_android.h",
|
| "media_codec_util.cc",
|
| @@ -90,6 +106,7 @@ if (is_android) {
|
| "//media:media_implementation",
|
| ]
|
| deps = [
|
| + ":common_aidl",
|
| ":media_jni_headers",
|
| "//media:media_features",
|
| "//media:shared_memory_support",
|
| @@ -125,6 +142,9 @@ if (is_android) {
|
| sources = [
|
| "java/src/org/chromium/media/AudioManagerAndroid.java",
|
| "java/src/org/chromium/media/AudioRecordInput.java",
|
| + "java/src/org/chromium/media/DialogSurfaceCallback.java",
|
| + "java/src/org/chromium/media/DialogSurfaceManagerWrapper.java",
|
| + "java/src/org/chromium/media/DialogSurfaceWrapper.java",
|
| "java/src/org/chromium/media/MediaCodecBridge.java",
|
| "java/src/org/chromium/media/MediaCodecUtil.java",
|
| "java/src/org/chromium/media/MediaDrmBridge.java",
|
| @@ -137,13 +157,23 @@ if (is_android) {
|
|
|
| android_library("media_java") {
|
| deps = [
|
| + ":common_aidl",
|
| "//base:base_java",
|
| "//content/public/android:content_java_resources",
|
| ]
|
|
|
| + 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/DialogSurfaceCallback.java",
|
| + "java/src/org/chromium/media/DialogSurfaceCore.java",
|
| + "java/src/org/chromium/media/DialogSurfaceImpl.java",
|
| + "java/src/org/chromium/media/DialogSurfaceWindowTokenProvider.java",
|
| + "java/src/org/chromium/media/DialogSurfaceWrapper.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",
|
|
|