Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(518)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/android/BUILD.gn

Issue 2132653002: MediaCodecLoop unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed includes Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/BUILD.gn ('k') | media/base/android/java/src/org/chromium/media/MediaCodecUtil.java » ('j') | media/base/android/media_codec_loop.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/BUILD.gn
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
index bc89ae0a591dce0feead4374c589ba8890b8b4de..bc0011be50aa12cf71e8e38d0c0f46afe81380ea 100644
--- a/media/base/android/BUILD.gn
+++ b/media/base/android/BUILD.gn
@@ -3,143 +3,185 @@
# found in the LICENSE file.
import("//build/config/android/config.gni")
DaleCurtis 2016/08/01 18:24:00 Is this accessible on non-android checkouts?
-import("//build/config/android/rules.gni")
import("//build/config/arm.gni")
import("//build/config/ui.gni")
import("//media/media_options.gni")
-assert(is_android)
+#assert(is_android)
DaleCurtis 2016/08/01 18:24:00 Delete now.
-source_set("android") {
+# These should compile on non-android platforms too.
+source_set("anywhere") {
sources = [
- "access_unit_queue.cc",
- "access_unit_queue.h",
- "android_cdm_factory.cc",
- "android_cdm_factory.h",
- "audio_decoder_job.cc",
- "audio_decoder_job.h",
- "audio_media_codec_decoder.cc",
- "audio_media_codec_decoder.h",
- "demuxer_android.h",
- "demuxer_stream_player_params.cc",
- "demuxer_stream_player_params.h",
- "media_client_android.cc",
- "media_client_android.h",
"media_codec_bridge.cc",
"media_codec_bridge.h",
- "media_codec_decoder.cc",
- "media_codec_decoder.h",
+ "media_codec_direction.h",
"media_codec_loop.cc",
"media_codec_loop.h",
- "media_codec_player.cc",
- "media_codec_player.h",
- "media_codec_util.cc",
- "media_codec_util.h",
- "media_decoder_job.cc",
- "media_decoder_job.h",
- "media_drm_bridge.cc",
- "media_drm_bridge.h",
- "media_drm_bridge_cdm_context.cc",
- "media_drm_bridge_cdm_context.h",
- "media_drm_bridge_delegate.cc",
- "media_drm_bridge_delegate.h",
- "media_jni_registrar.cc",
- "media_jni_registrar.h",
- "media_player_android.cc",
- "media_player_android.h",
- "media_player_bridge.cc",
- "media_player_bridge.h",
- "media_player_listener.cc",
- "media_player_listener.h",
- "media_player_manager.h",
- "media_resource_getter.cc",
- "media_resource_getter.h",
- "media_source_player.cc",
- "media_source_player.h",
- "media_statistics.cc",
- "media_statistics.h",
- "media_task_runner.cc",
- "media_task_runner.h",
- "media_url_demuxer.cc",
- "media_url_demuxer.h",
- "media_url_interceptor.h",
- "provision_fetcher.h",
- "sdk_media_codec_bridge.cc",
- "sdk_media_codec_bridge.h",
- "video_decoder_job.cc",
- "video_decoder_job.h",
- "video_media_codec_decoder.cc",
- "video_media_codec_decoder.h",
]
configs += [
"//media:media_config",
"//media:media_implementation",
]
deps = [
- ":media_jni_headers",
"//media:media_features",
"//media:shared_memory_support",
- "//third_party/widevine/cdm:version_h",
"//ui/gl",
"//url",
]
}
-source_set("unittests") {
+# These should compile on non-android platforms too.
+source_set("anywhere_unittests") {
testonly = true
sources = [
- "access_unit_queue_unittest.cc",
- "media_codec_decoder_unittest.cc",
"media_codec_loop_unittest.cc",
- "media_drm_bridge_unittest.cc",
- "media_player_bridge_unittest.cc",
- "media_source_player_unittest.cc",
- "media_url_demuxer_unittest.cc",
- "sdk_media_codec_bridge_unittest.cc",
- "test_data_factory.cc",
- "test_data_factory.h",
- "test_statistics.h",
+ "mock_media_codec_bridge.cc",
+ "mock_media_codec_bridge.h",
+ ]
+ configs += [
+ "//media:media_config",
+ "//media:media_implementation",
]
-
- if (proprietary_codecs) {
- sources += [ "media_codec_player_unittest.cc" ]
- }
-
deps = [
- ":android",
+ ":anywhere",
"//media/base:test_support",
"//testing/gmock",
"//testing/gtest",
- "//third_party/widevine/cdm:version_h",
]
- configs += [ "//media:media_config" ]
}
-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/MediaCodecBridge.java",
- "java/src/org/chromium/media/MediaCodecUtil.java",
- "java/src/org/chromium/media/MediaDrmBridge.java",
- "java/src/org/chromium/media/MediaPlayerBridge.java",
- "java/src/org/chromium/media/MediaPlayerListener.java",
- ]
- jni_package = "media"
-}
+if (is_android) {
+ import("//build/config/android/rules.gni")
-android_library("media_java") {
- deps = [
- "//base:base_java",
- ]
+ source_set("android") {
+ sources = [
+ "access_unit_queue.cc",
+ "access_unit_queue.h",
+ "android_cdm_factory.cc",
+ "android_cdm_factory.h",
+ "audio_decoder_job.cc",
+ "audio_decoder_job.h",
+ "audio_media_codec_decoder.cc",
+ "audio_media_codec_decoder.h",
+ "demuxer_android.h",
+ "demuxer_stream_player_params.cc",
+ "demuxer_stream_player_params.h",
+ "media_client_android.cc",
+ "media_client_android.h",
+ "media_codec_decoder.cc",
+ "media_codec_decoder.h",
+ "media_codec_player.cc",
+ "media_codec_player.h",
+ "media_codec_util.cc",
+ "media_codec_util.h",
+ "media_decoder_job.cc",
+ "media_decoder_job.h",
+ "media_drm_bridge.cc",
+ "media_drm_bridge.h",
+ "media_drm_bridge_cdm_context.cc",
+ "media_drm_bridge_cdm_context.h",
+ "media_drm_bridge_delegate.cc",
+ "media_drm_bridge_delegate.h",
+ "media_jni_registrar.cc",
+ "media_jni_registrar.h",
+ "media_player_android.cc",
+ "media_player_android.h",
+ "media_player_bridge.cc",
+ "media_player_bridge.h",
+ "media_player_listener.cc",
+ "media_player_listener.h",
+ "media_player_manager.h",
+ "media_resource_getter.cc",
+ "media_resource_getter.h",
+ "media_source_player.cc",
+ "media_source_player.h",
+ "media_statistics.cc",
+ "media_statistics.h",
+ "media_task_runner.cc",
+ "media_task_runner.h",
+ "media_url_demuxer.cc",
+ "media_url_demuxer.h",
+ "media_url_interceptor.h",
+ "provision_fetcher.h",
+ "sdk_media_codec_bridge.cc",
+ "sdk_media_codec_bridge.h",
+ "video_decoder_job.cc",
+ "video_decoder_job.h",
+ "video_media_codec_decoder.cc",
+ "video_media_codec_decoder.h",
+ ]
+ configs += [
+ "//media:media_config",
+ "//media:media_implementation",
+ ]
+ deps = [
+ ":media_jni_headers",
+ "//media:media_features",
+ "//media:shared_memory_support",
+ "//third_party/widevine/cdm:version_h",
+ "//ui/gl",
+ "//url",
+ ]
+ public_deps = [
+ ":anywhere",
+ ]
+ }
- java_files = [
- "java/src/org/chromium/media/AudioManagerAndroid.java",
- "java/src/org/chromium/media/AudioRecordInput.java",
- "java/src/org/chromium/media/MediaCodecBridge.java",
- "java/src/org/chromium/media/MediaCodecUtil.java",
- "java/src/org/chromium/media/MediaDrmBridge.java",
- "java/src/org/chromium/media/MediaPlayerBridge.java",
- "java/src/org/chromium/media/MediaPlayerListener.java",
- ]
+ source_set("unittests") {
+ testonly = true
+ sources = [
+ "access_unit_queue_unittest.cc",
+ "media_codec_decoder_unittest.cc",
+ "media_drm_bridge_unittest.cc",
+ "media_player_bridge_unittest.cc",
+ "media_source_player_unittest.cc",
+ "media_url_demuxer_unittest.cc",
+ "sdk_media_codec_bridge_unittest.cc",
+ "test_data_factory.cc",
+ "test_data_factory.h",
+ "test_statistics.h",
+ ]
+
+ if (proprietary_codecs) {
+ sources += [ "media_codec_player_unittest.cc" ]
+ }
+
+ deps = [
+ ":android",
+ "//media/base:test_support",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//third_party/widevine/cdm:version_h",
+ ]
+ configs += [ "//media:media_config" ]
+ }
+
+ 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/MediaCodecBridge.java",
+ "java/src/org/chromium/media/MediaCodecUtil.java",
+ "java/src/org/chromium/media/MediaDrmBridge.java",
+ "java/src/org/chromium/media/MediaPlayerBridge.java",
+ "java/src/org/chromium/media/MediaPlayerListener.java",
+ ]
+ jni_package = "media"
+ }
+
+ android_library("media_java") {
+ deps = [
+ "//base:base_java",
+ ]
+
+ java_files = [
+ "java/src/org/chromium/media/AudioManagerAndroid.java",
+ "java/src/org/chromium/media/AudioRecordInput.java",
+ "java/src/org/chromium/media/MediaCodecBridge.java",
+ "java/src/org/chromium/media/MediaCodecUtil.java",
+ "java/src/org/chromium/media/MediaDrmBridge.java",
+ "java/src/org/chromium/media/MediaPlayerBridge.java",
+ "java/src/org/chromium/media/MediaPlayerListener.java",
+ ]
+ }
}
« no previous file with comments | « media/base/BUILD.gn ('k') | media/base/android/java/src/org/chromium/media/MediaCodecUtil.java » ('j') | media/base/android/media_codec_loop.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698