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

Side by Side Diff: media/BUILD.gn

Issue 914363002: Add the "is_ensemble" build variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Gate on !is_ensemble instead. Add GYP changes. Created 5 years, 10 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 | « no previous file | media/base/BUILD.gn » ('j') | media/media.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 "filters/decrypting_video_decoder.cc", 115 "filters/decrypting_video_decoder.cc",
116 "filters/decrypting_video_decoder.h", 116 "filters/decrypting_video_decoder.h",
117 "filters/default_media_permission.cc", 117 "filters/default_media_permission.cc",
118 "filters/default_media_permission.h", 118 "filters/default_media_permission.h",
119 "filters/file_data_source.cc", 119 "filters/file_data_source.cc",
120 "filters/file_data_source.h", 120 "filters/file_data_source.h",
121 "filters/frame_processor.cc", 121 "filters/frame_processor.cc",
122 "filters/frame_processor.h", 122 "filters/frame_processor.h",
123 "filters/gpu_video_accelerator_factories.cc", 123 "filters/gpu_video_accelerator_factories.cc",
124 "filters/gpu_video_accelerator_factories.h", 124 "filters/gpu_video_accelerator_factories.h",
125 "filters/gpu_video_decoder.cc",
126 "filters/gpu_video_decoder.h",
127 "filters/h264_bit_reader.cc", 125 "filters/h264_bit_reader.cc",
128 "filters/h264_bit_reader.h", 126 "filters/h264_bit_reader.h",
129 "filters/h264_parser.cc", 127 "filters/h264_parser.cc",
130 "filters/h264_parser.h", 128 "filters/h264_parser.h",
131 "filters/jpeg_parser.cc", 129 "filters/jpeg_parser.cc",
132 "filters/jpeg_parser.h", 130 "filters/jpeg_parser.h",
133 "filters/renderer_impl.cc", 131 "filters/renderer_impl.cc",
134 "filters/renderer_impl.h", 132 "filters/renderer_impl.h",
135 "filters/skcanvas_video_renderer.cc",
136 "filters/skcanvas_video_renderer.h",
137 "filters/source_buffer_platform.cc", 133 "filters/source_buffer_platform.cc",
138 "filters/source_buffer_platform.h", 134 "filters/source_buffer_platform.h",
139 "filters/source_buffer_range.cc", 135 "filters/source_buffer_range.cc",
140 "filters/source_buffer_range.h", 136 "filters/source_buffer_range.h",
141 "filters/source_buffer_stream.cc", 137 "filters/source_buffer_stream.cc",
142 "filters/source_buffer_stream.h", 138 "filters/source_buffer_stream.h",
143 "filters/stream_parser_factory.cc", 139 "filters/stream_parser_factory.cc",
144 "filters/stream_parser_factory.h", 140 "filters/stream_parser_factory.h",
145 "filters/video_frame_scheduler.h", 141 "filters/video_frame_scheduler.h",
146 "filters/video_frame_scheduler_impl.cc", 142 "filters/video_frame_scheduler_impl.cc",
(...skipping 24 matching lines...) Expand all
171 "midi/midi_port_info.cc", 167 "midi/midi_port_info.cc",
172 "midi/midi_port_info.h", 168 "midi/midi_port_info.h",
173 "midi/usb_midi_descriptor_parser.cc", 169 "midi/usb_midi_descriptor_parser.cc",
174 "midi/usb_midi_descriptor_parser.h", 170 "midi/usb_midi_descriptor_parser.h",
175 "midi/usb_midi_device.h", 171 "midi/usb_midi_device.h",
176 "midi/usb_midi_input_stream.cc", 172 "midi/usb_midi_input_stream.cc",
177 "midi/usb_midi_input_stream.h", 173 "midi/usb_midi_input_stream.h",
178 "midi/usb_midi_jack.h", 174 "midi/usb_midi_jack.h",
179 "midi/usb_midi_output_stream.cc", 175 "midi/usb_midi_output_stream.cc",
180 "midi/usb_midi_output_stream.h", 176 "midi/usb_midi_output_stream.h",
181 "video/capture/fake_video_capture_device.cc",
182 "video/capture/fake_video_capture_device.h",
183 "video/capture/fake_video_capture_device_factory.h",
184 "video/capture/fake_video_capture_device_factory.cc",
185 "video/capture/file_video_capture_device.cc", 177 "video/capture/file_video_capture_device.cc",
186 "video/capture/file_video_capture_device.h", 178 "video/capture/file_video_capture_device.h",
187 "video/capture/file_video_capture_device_factory.h",
188 "video/capture/file_video_capture_device_factory.cc",
189 "video/capture/linux/video_capture_device_factory_linux.cc",
190 "video/capture/linux/video_capture_device_factory_linux.h",
191 "video/capture/linux/video_capture_device_linux.cc", 179 "video/capture/linux/video_capture_device_linux.cc",
192 "video/capture/linux/video_capture_device_linux.h", 180 "video/capture/linux/video_capture_device_linux.h",
193 "video/capture/linux/video_capture_device_chromeos.cc", 181 "video/capture/linux/video_capture_device_chromeos.cc",
194 "video/capture/linux/video_capture_device_chromeos.h", 182 "video/capture/linux/video_capture_device_chromeos.h",
195 "video/capture/mac/platform_video_capturing_mac.h", 183 "video/capture/mac/platform_video_capturing_mac.h",
196 "video/capture/mac/video_capture_device_avfoundation_mac.h", 184 "video/capture/mac/video_capture_device_avfoundation_mac.h",
197 "video/capture/mac/video_capture_device_avfoundation_mac.mm", 185 "video/capture/mac/video_capture_device_avfoundation_mac.mm",
198 "video/capture/mac/video_capture_device_decklink_mac.h", 186 "video/capture/mac/video_capture_device_decklink_mac.h",
199 "video/capture/mac/video_capture_device_decklink_mac.mm", 187 "video/capture/mac/video_capture_device_decklink_mac.mm",
200 "video/capture/mac/video_capture_device_factory_mac.h", 188 "video/capture/mac/video_capture_device_factory_mac.h",
201 "video/capture/mac/video_capture_device_factory_mac.mm", 189 "video/capture/mac/video_capture_device_factory_mac.mm",
202 "video/capture/mac/video_capture_device_mac.h", 190 "video/capture/mac/video_capture_device_mac.h",
203 "video/capture/mac/video_capture_device_mac.mm", 191 "video/capture/mac/video_capture_device_mac.mm",
204 "video/capture/mac/video_capture_device_qtkit_mac.h", 192 "video/capture/mac/video_capture_device_qtkit_mac.h",
205 "video/capture/mac/video_capture_device_qtkit_mac.mm", 193 "video/capture/mac/video_capture_device_qtkit_mac.mm",
206 "video/capture/video_capture_device.cc", 194 "video/capture/video_capture_device.cc",
207 "video/capture/video_capture_device.h", 195 "video/capture/video_capture_device.h",
208 "video/capture/video_capture_device_factory.cc",
209 "video/capture/video_capture_device_factory.h",
210 "video/capture/video_capture_device_info.cc", 196 "video/capture/video_capture_device_info.cc",
211 "video/capture/video_capture_device_info.h", 197 "video/capture/video_capture_device_info.h",
212 "video/capture/video_capture_types.cc", 198 "video/capture/video_capture_types.cc",
213 "video/capture/video_capture_types.h", 199 "video/capture/video_capture_types.h",
214 "video/capture/win/capability_list_win.cc", 200 "video/capture/win/capability_list_win.cc",
215 "video/capture/win/capability_list_win.h", 201 "video/capture/win/capability_list_win.h",
216 "video/capture/win/filter_base_win.cc", 202 "video/capture/win/filter_base_win.cc",
217 "video/capture/win/filter_base_win.h", 203 "video/capture/win/filter_base_win.h",
218 "video/capture/win/pin_base_win.cc", 204 "video/capture/win/pin_base_win.cc",
219 "video/capture/win/pin_base_win.h", 205 "video/capture/win/pin_base_win.h",
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 if (media_use_libvpx) { 299 if (media_use_libvpx) {
314 sources += [ 300 sources += [
315 "filters/vpx_video_decoder.cc", 301 "filters/vpx_video_decoder.cc",
316 "filters/vpx_video_decoder.h", 302 "filters/vpx_video_decoder.h",
317 ] 303 ]
318 deps += [ "//third_party/libvpx" ] 304 deps += [ "//third_party/libvpx" ]
319 } 305 }
320 306
321 if (!is_android) { 307 if (!is_android) {
322 sources += [ 308 sources += [
323 "filters/default_renderer_factory.cc",
324 "filters/default_renderer_factory.h",
325 "filters/opus_audio_decoder.cc", 309 "filters/opus_audio_decoder.cc",
326 "filters/opus_audio_decoder.h", 310 "filters/opus_audio_decoder.h",
327 ] 311 ]
312 if (!is_ensemble) {
DaleCurtis 2015/02/12 02:33:42 Why nest?
wtc 2015/02/12 15:20:31 In the original code, "filters/opus_audio_decoder.
DaleCurtis 2015/02/12 19:19:12 I see. What you have is fine then.
313 sources += [
314 "filters/default_renderer_factory.cc",
315 "filters/default_renderer_factory.h",
316 ]
317 }
328 } else { 318 } else {
329 sources += [ 319 sources += [
330 "midi/midi_manager_android.cc", 320 "midi/midi_manager_android.cc",
331 "midi/usb_midi_device_android.cc", 321 "midi/usb_midi_device_android.cc",
332 "midi/usb_midi_device_android.h", 322 "midi/usb_midi_device_android.h",
333 "midi/usb_midi_device_factory_android.cc", 323 "midi/usb_midi_device_factory_android.cc",
334 "midi/usb_midi_device_factory_android.h", 324 "midi/usb_midi_device_factory_android.h",
335 "video/capture/android/video_capture_device_android.cc", 325 "video/capture/android/video_capture_device_android.cc",
336 "video/capture/android/video_capture_device_android.h", 326 "video/capture/android/video_capture_device_android.h",
337 "video/capture/android/video_capture_device_factory_android.cc", 327 "video/capture/android/video_capture_device_factory_android.cc",
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 ] 463 ]
474 464
475 deps += [ 465 deps += [
476 ":shared_memory_support", 466 ":shared_memory_support",
477 "//base", 467 "//base",
478 "//base:i18n", 468 "//base:i18n",
479 "//base/third_party/dynamic_annotations", 469 "//base/third_party/dynamic_annotations",
480 "//crypto", 470 "//crypto",
481 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings 471 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings
482 "//gpu/command_buffer/common", 472 "//gpu/command_buffer/common",
483 "//skia",
484 "//third_party/libyuv", 473 "//third_party/libyuv",
485 "//third_party/opus", 474 "//third_party/opus",
486 "//ui/events:events_base",
487 "//ui/gfx",
488 "//ui/gfx/geometry", 475 "//ui/gfx/geometry",
489 "//url", 476 "//url",
490 ] 477 ]
478
479 # Add source files and dependencies that need X11, font, or graphics
480 # libraries.
481 if (!is_ensemble) {
482 sources += [
483 "filters/gpu_video_decoder.cc",
484 "filters/gpu_video_decoder.h",
485 "filters/skcanvas_video_renderer.cc",
486 "filters/skcanvas_video_renderer.h",
487 "video/capture/fake_video_capture_device.cc",
488 "video/capture/fake_video_capture_device.h",
489 "video/capture/fake_video_capture_device_factory.cc",
490 "video/capture/fake_video_capture_device_factory.h",
491 "video/capture/file_video_capture_device_factory.cc",
492 "video/capture/file_video_capture_device_factory.h",
493 "video/capture/linux/video_capture_device_factory_linux.cc",
494 "video/capture/linux/video_capture_device_factory_linux.h",
495 "video/capture/video_capture_device_factory.cc",
496 "video/capture/video_capture_device_factory.h",
497 ]
498
499 deps += [
500 "//skia",
501 "//ui/events:events_base",
502 "//ui/gfx",
503 ]
504 }
491 } 505 }
492 506
493 # Minimal media component for media/cast on iOS. 507 # Minimal media component for media/cast on iOS.
494 if (is_ios) { 508 if (is_ios) {
495 component("media_for_cast_ios") { 509 component("media_for_cast_ios") {
496 configs += [ ":media_config" ] 510 configs += [ ":media_config" ]
497 all_dependent_configs = [ ":media_dependent_config" ] 511 all_dependent_configs = [ ":media_dependent_config" ]
498 include_dirs = [ "." ] 512 include_dirs = [ "." ]
499 libs = [ "CoreVideo.framework" ] 513 libs = [ "CoreVideo.framework" ]
500 514
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 deps = [ 790 deps = [
777 ":media", 791 ":media",
778 ":shared_memory_support", 792 ":shared_memory_support",
779 "//base", 793 "//base",
780 "//ui/gl", 794 "//ui/gl",
781 "//ui/gfx", 795 "//ui/gfx",
782 "//ui/gfx/geometry", 796 "//ui/gfx/geometry",
783 ] 797 ]
784 } 798 }
785 } 799 }
OLDNEW
« no previous file with comments | « no previous file | media/base/BUILD.gn » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698