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

Unified Diff: media/cast/cast.gyp

Issue 581803003: Define a new media_cast component for iOS cast builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/video_frame.cc ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/cast.gyp
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
index b646455c43fdfa7398bcc26448d3b32c63629401..38fd9807d0250b86627d033538e0d963abba832a 100644
--- a/media/cast/cast.gyp
+++ b/media/cast/cast.gyp
@@ -6,6 +6,7 @@
'variables': {
'include_tests%': 1,
'chromium_code': 1,
+ 'cast_use_media_cast%': 0,
},
'conditions': [
['include_tests==1', {
@@ -91,11 +92,8 @@
'cast_base',
'cast_net',
'<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/media/media.gyp:shared_memory_support',
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
'sources': [
'cast_receiver.h',
@@ -120,6 +118,13 @@
'net/rtp/rtp_receiver_defines.cc',
'net/rtp/rtp_receiver_defines.h',
], # source
+ 'conditions': [
+ ['cast_use_media_cast==1', {
+ 'dependencies': ['<(DEPTH)/media/media.gyp:media_cast']
+ }, { # cast_use_media_cast==1
+ 'dependencies': ['<(DEPTH)/media/media.gyp:media']
+ }],
+ ], # conditions
},
{
# GN version: //media/cast:sender
@@ -131,8 +136,6 @@
'dependencies': [
'cast_base',
'cast_net',
- '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/media/media.gyp:shared_memory_support',
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
], # dependencies
@@ -150,7 +153,7 @@
'sender/external_video_encoder.cc',
'sender/fake_software_video_encoder.h',
'sender/fake_software_video_encoder.cc',
- 'sender/frame_sender.cc',
+ 'sender/frame_sender.cc',
'sender/frame_sender.h',
'sender/software_video_encoder.h',
'sender/video_encoder.h',
@@ -161,6 +164,13 @@
'sender/vp8_encoder.cc',
'sender/vp8_encoder.h',
], # source
+ 'conditions': [
+ ['cast_use_media_cast==1', {
+ 'dependencies': ['<(DEPTH)/media/media.gyp:media_cast']
+ }, { # cast_use_media_cast==1
+ 'dependencies': ['<(DEPTH)/media/media.gyp:media']
+ }],
+ ], # conditions
},
{
# GN version: //media/cast:net
« no previous file with comments | « media/base/video_frame.cc ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698