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

Side by Side Diff: media/cast/cast.gyp

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase Created 5 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 unified diff | Download patch
« no previous file with comments | « media/cast/BUILD.gn ('k') | media/cast/receiver/video_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'include_tests%': 1, 7 'include_tests%': 1,
8 'chromium_code': 1, 8 'chromium_code': 1,
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 'include_dirs': [ 87 'include_dirs': [
88 '<(DEPTH)/', 88 '<(DEPTH)/',
89 ], 89 ],
90 'dependencies': [ 90 'dependencies': [
91 'cast_base', 91 'cast_base',
92 'cast_net', 92 'cast_net',
93 '<(DEPTH)/base/base.gyp:base', 93 '<(DEPTH)/base/base.gyp:base',
94 '<(DEPTH)/media/media.gyp:media', 94 '<(DEPTH)/media/media.gyp:media',
95 '<(DEPTH)/media/media.gyp:shared_memory_support', 95 '<(DEPTH)/media/media.gyp:shared_memory_support',
96 '<(DEPTH)/third_party/opus/opus.gyp:opus', 96 '<(DEPTH)/third_party/opus/opus.gyp:opus',
97 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 97 '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new',
98 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 98 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
99 ], 99 ],
100 'sources': [ 100 'sources': [
101 'cast_receiver.h', 101 'cast_receiver.h',
102 'net/rtp/cast_message_builder.cc', 102 'net/rtp/cast_message_builder.cc',
103 'net/rtp/cast_message_builder.h', 103 'net/rtp/cast_message_builder.h',
104 'net/rtp/frame_buffer.cc', 104 'net/rtp/frame_buffer.cc',
105 'net/rtp/frame_buffer.h', 105 'net/rtp/frame_buffer.h',
106 'net/rtp/framer.cc', 106 'net/rtp/framer.cc',
107 'net/rtp/framer.h', 107 'net/rtp/framer.h',
(...skipping 10 matching lines...) Expand all
118 'receiver/video_decoder.cc', 118 'receiver/video_decoder.cc',
119 'receiver/video_decoder.h', 119 'receiver/video_decoder.h',
120 ], # source 120 ], # source
121 'conditions': [ 121 'conditions': [
122 # use a restricted subset of media and no software codecs on iOS 122 # use a restricted subset of media and no software codecs on iOS
123 ['OS=="ios"', { 123 ['OS=="ios"', {
124 'dependencies': [ '<(DEPTH)/media/media.gyp:media_for_cast_ios' ], 124 'dependencies': [ '<(DEPTH)/media/media.gyp:media_for_cast_ios' ],
125 'dependencies!': [ 125 'dependencies!': [
126 '<(DEPTH)/media/media.gyp:media', 126 '<(DEPTH)/media/media.gyp:media',
127 '<(DEPTH)/third_party/opus/opus.gyp:opus', 127 '<(DEPTH)/third_party/opus/opus.gyp:opus',
128 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 128 '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new',
129 ], 129 ],
130 }], # OS=="ios" 130 }], # OS=="ios"
131 ], # conditions 131 ], # conditions
132 }, 132 },
133 { 133 {
134 # GN version: //media/cast:sender 134 # GN version: //media/cast:sender
135 'target_name': 'cast_sender', 135 'target_name': 'cast_sender',
136 'type': 'static_library', 136 'type': 'static_library',
137 'include_dirs': [ 137 'include_dirs': [
138 '<(DEPTH)/', 138 '<(DEPTH)/',
139 ], 139 ],
140 'dependencies': [ 140 'dependencies': [
141 'cast_base', 141 'cast_base',
142 'cast_net', 142 'cast_net',
143 '<(DEPTH)/media/media.gyp:media', 143 '<(DEPTH)/media/media.gyp:media',
144 '<(DEPTH)/media/media.gyp:shared_memory_support', 144 '<(DEPTH)/media/media.gyp:shared_memory_support',
145 '<(DEPTH)/third_party/opus/opus.gyp:opus', 145 '<(DEPTH)/third_party/opus/opus.gyp:opus',
146 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 146 '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new',
147 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 147 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
148 ], # dependencies 148 ], # dependencies
149 'sources': [ 149 'sources': [
150 'cast_sender.h', 150 'cast_sender.h',
151 'cast_sender_impl.cc', 151 'cast_sender_impl.cc',
152 'cast_sender_impl.h', 152 'cast_sender_impl.h',
153 'sender/audio_encoder.cc', 153 'sender/audio_encoder.cc',
154 'sender/audio_encoder.h', 154 'sender/audio_encoder.h',
155 'sender/audio_sender.cc', 155 'sender/audio_sender.cc',
156 'sender/audio_sender.h', 156 'sender/audio_sender.h',
(...skipping 22 matching lines...) Expand all
179 'sender/vp8_encoder.cc', 179 'sender/vp8_encoder.cc',
180 'sender/vp8_encoder.h', 180 'sender/vp8_encoder.h',
181 ], # source 181 ], # source
182 'conditions': [ 182 'conditions': [
183 # use a restricted subset of media and no software codecs on iOS 183 # use a restricted subset of media and no software codecs on iOS
184 ['OS=="ios"', { 184 ['OS=="ios"', {
185 'dependencies': [ '<(DEPTH)/media/media.gyp:media_for_cast_ios' ], 185 'dependencies': [ '<(DEPTH)/media/media.gyp:media_for_cast_ios' ],
186 'dependencies!': [ 186 'dependencies!': [
187 '<(DEPTH)/media/media.gyp:media', 187 '<(DEPTH)/media/media.gyp:media',
188 '<(DEPTH)/third_party/opus/opus.gyp:opus', 188 '<(DEPTH)/third_party/opus/opus.gyp:opus',
189 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 189 '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new',
190 ], 190 ],
191 'sources!': [ 191 'sources!': [
192 'sender/external_video_encoder.cc', 192 'sender/external_video_encoder.cc',
193 'sender/external_video_encoder.h', 193 'sender/external_video_encoder.h',
194 'sender/video_encoder_impl.cc', 194 'sender/video_encoder_impl.cc',
195 'sender/video_encoder_impl.h', 195 'sender/video_encoder_impl.h',
196 'sender/vp8_encoder.cc', 196 'sender/vp8_encoder.cc',
197 'sender/vp8_encoder.h', 197 'sender/vp8_encoder.h',
198 ], 198 ],
199 }], # OS=="ios" 199 }], # OS=="ios"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 'net/rtp/rtp_parser.cc', 249 'net/rtp/rtp_parser.cc',
250 'net/rtp/rtp_parser.h', 250 'net/rtp/rtp_parser.h',
251 'net/rtp/rtp_sender.cc', 251 'net/rtp/rtp_sender.cc',
252 'net/rtp/rtp_sender.h', 252 'net/rtp/rtp_sender.h',
253 'net/udp_transport.cc', 253 'net/udp_transport.cc',
254 'net/udp_transport.h', 254 'net/udp_transport.h',
255 ], # source 255 ], # source
256 }, 256 },
257 ], 257 ],
258 } 258 }
OLDNEW
« no previous file with comments | « media/cast/BUILD.gn ('k') | media/cast/receiver/video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698