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

Unified Diff: content/content_common.gypi

Issue 269673005: media: Add MediaOzonePlatform support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix up dependency cycle Created 6 years, 7 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
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 34bda3a9a54fe5940146e412809d319c8b98e42d..8e85770debc5adf2dbac82f8bf85af98ff5dcefb 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -276,8 +276,8 @@
'common/gpu/media/gpu_video_decode_accelerator.h',
'common/gpu/media/gpu_video_encode_accelerator.cc',
'common/gpu/media/gpu_video_encode_accelerator.h',
- 'common/gpu/media/video_decode_accelerator_impl.cc',
- 'common/gpu/media/video_decode_accelerator_impl.h',
+ 'common/gpu/media/ozone_video_decode_accelerator.cc',
+ 'common/gpu/media/ozone_video_decode_accelerator.h',
'common/gpu/stream_texture_android.cc',
'common/gpu/stream_texture_android.h',
'common/gpu/sync_point_manager.cc',
@@ -516,6 +516,7 @@
'../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
'../ipc/ipc.gyp:ipc',
'../media/media.gyp:media',
+ '../media/media.gyp:media_types',
'../media/media.gyp:shared_memory_support',
'../mojo/mojo.gyp:mojo_environment_chromium',
'../mojo/mojo.gyp:mojo_system_impl',
@@ -596,6 +597,7 @@
['OS=="android"', {
'dependencies': [
'../media/media.gyp:media',
+ '../media/media.gyp:media_types',
],
'sources': [
'common/gpu/media/android_video_decode_accelerator.cc',
@@ -614,6 +616,7 @@
['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
'dependencies': [
'../media/media.gyp:media',
+ '../media/media.gyp:media_types',
],
'sources': [
'common/gpu/media/exynos_v4l2_video_device.cc',
@@ -693,6 +696,7 @@
['OS=="win"', {
'dependencies': [
'../media/media.gyp:media',
+ '../media/media.gyp:media_types',
'../ui/gl/gl.gyp:gl',
],
'link_settings': {

Powered by Google App Engine
This is Rietveld 408576698