Index: media/base/android/BUILD.gn |
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn |
index 71ce7be9ff8e395dccf7518f62ee3f4905c734f7..132aaf178cc090cdffb47455f9ef4f1691247c1e 100644 |
--- a/media/base/android/BUILD.gn |
+++ b/media/base/android/BUILD.gn |
@@ -51,10 +51,27 @@ 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/IAndroidOverlay.aidl", |
+ "java/src/org/chromium/media/IAndroidOverlayCallback.aidl", |
+ "java/src/org/chromium/media/IAndroidOverlayCompletion.aidl", |
+ "java/src/org/chromium/media/IAndroidOverlayProvider.aidl", |
+ ] |
+ } |
+ |
source_set("android") { |
sources = [ |
"android_cdm_factory.cc", |
"android_cdm_factory.h", |
+ "android_overlay_callback.cc", |
+ "android_overlay_callback.h", |
+ "android_overlay_provider_proxy.cc", |
+ "android_overlay_provider_proxy.h", |
+ "android_overlay_proxy.cc", |
+ "android_overlay_proxy.h", |
"media_client_android.cc", |
"media_client_android.h", |
"media_codec_util.cc", |
@@ -90,6 +107,7 @@ if (is_android) { |
"//media:media_implementation", |
] |
deps = [ |
+ ":common_aidl", |
":media_jni_headers", |
"//media:media_features", |
"//media:shared_memory_support", |
@@ -123,6 +141,9 @@ if (is_android) { |
generate_jni("media_jni_headers") { |
sources = [ |
+ "java/src/org/chromium/media/AndroidOverlayCallback.java", |
+ "java/src/org/chromium/media/AndroidOverlayProviderProxy.java", |
+ "java/src/org/chromium/media/AndroidOverlayProxy.java", |
"java/src/org/chromium/media/AudioManagerAndroid.java", |
"java/src/org/chromium/media/AudioRecordInput.java", |
"java/src/org/chromium/media/MediaCodecBridge.java", |
@@ -137,13 +158,19 @@ 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/AndroidOverlayCallback.java", |
+ "java/src/org/chromium/media/AndroidOverlayProxy.java", |
+ "java/src/org/chromium/media/AndroidOverlayProviderProxy.java", |
"java/src/org/chromium/media/MediaCodecBridge.java", |
"java/src/org/chromium/media/MediaCodecUtil.java", |
"java/src/org/chromium/media/MediaDrmBridge.java", |