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

Side by Side Diff: media/media.gyp

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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
11 # (DT_NEEDED) instead of using dlopen. This helps with automated 11 # (DT_NEEDED) instead of using dlopen. This helps with automated
12 # detection of ABI mismatches and prevents silent errors. 12 # detection of ABI mismatches and prevents silent errors.
13 'linux_link_pulseaudio%': 0, 13 'linux_link_pulseaudio%': 0,
14 # Override to omit code that depends on the X11, font, and graphics
15 # libraries.
16 'is_ensemble%': 0,
14 'conditions': [ 17 'conditions': [
15 ['OS=="android" or OS=="ios"', { 18 ['OS=="android" or OS=="ios"', {
16 # Android and iOS don't use ffmpeg or libvpx. 19 # Android and iOS don't use ffmpeg or libvpx.
17 'media_use_ffmpeg%': 0, 20 'media_use_ffmpeg%': 0,
18 'media_use_libvpx%': 0, 21 'media_use_libvpx%': 0,
19 }, { # 'OS!="android" and OS!="ios"' 22 }, { # 'OS!="android" and OS!="ios"'
20 'media_use_ffmpeg%': 1, 23 'media_use_ffmpeg%': 1,
21 'media_use_libvpx%': 1, 24 'media_use_libvpx%': 1,
22 }], 25 }],
23 # Enable ALSA and Pulse for runtime selection. 26 # Enable ALSA and Pulse for runtime selection.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 { 58 {
56 # GN version: //media 59 # GN version: //media
57 'target_name': 'media', 60 'target_name': 'media',
58 'type': '<(component)', 61 'type': '<(component)',
59 'dependencies': [ 62 'dependencies': [
60 '../base/base.gyp:base', 63 '../base/base.gyp:base',
61 '../base/base.gyp:base_i18n', 64 '../base/base.gyp:base_i18n',
62 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 65 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
63 '../crypto/crypto.gyp:crypto', 66 '../crypto/crypto.gyp:crypto',
64 '../gpu/gpu.gyp:command_buffer_common', 67 '../gpu/gpu.gyp:command_buffer_common',
65 '../skia/skia.gyp:skia',
66 '../third_party/libyuv/libyuv.gyp:libyuv', 68 '../third_party/libyuv/libyuv.gyp:libyuv',
67 '../third_party/opus/opus.gyp:opus', 69 '../third_party/opus/opus.gyp:opus',
68 '../ui/events/events.gyp:events_base',
69 '../ui/gfx/gfx.gyp:gfx',
70 '../ui/gfx/gfx.gyp:gfx_geometry', 70 '../ui/gfx/gfx.gyp:gfx_geometry',
71 '../url/url.gyp:url_lib', 71 '../url/url.gyp:url_lib',
72 'shared_memory_support', 72 'shared_memory_support',
73 ], 73 ],
74 'defines': [ 74 'defines': [
75 'MEDIA_IMPLEMENTATION', 75 'MEDIA_IMPLEMENTATION',
76 ], 76 ],
77 'include_dirs': [ 77 'include_dirs': [
78 '..', 78 '..',
79 ], 79 ],
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 'filters/ffmpeg_glue.cc', 448 'filters/ffmpeg_glue.cc',
449 'filters/ffmpeg_glue.h', 449 'filters/ffmpeg_glue.h',
450 'filters/ffmpeg_video_decoder.cc', 450 'filters/ffmpeg_video_decoder.cc',
451 'filters/ffmpeg_video_decoder.h', 451 'filters/ffmpeg_video_decoder.h',
452 'filters/file_data_source.cc', 452 'filters/file_data_source.cc',
453 'filters/file_data_source.h', 453 'filters/file_data_source.h',
454 'filters/frame_processor.cc', 454 'filters/frame_processor.cc',
455 'filters/frame_processor.h', 455 'filters/frame_processor.h',
456 'filters/gpu_video_accelerator_factories.cc', 456 'filters/gpu_video_accelerator_factories.cc',
457 'filters/gpu_video_accelerator_factories.h', 457 'filters/gpu_video_accelerator_factories.h',
458 'filters/gpu_video_decoder.cc',
459 'filters/gpu_video_decoder.h',
460 'filters/h264_bit_reader.cc', 458 'filters/h264_bit_reader.cc',
461 'filters/h264_bit_reader.h', 459 'filters/h264_bit_reader.h',
462 'filters/h264_parser.cc', 460 'filters/h264_parser.cc',
463 'filters/h264_parser.h', 461 'filters/h264_parser.h',
464 'filters/in_memory_url_protocol.cc', 462 'filters/in_memory_url_protocol.cc',
465 'filters/in_memory_url_protocol.h', 463 'filters/in_memory_url_protocol.h',
466 'filters/jpeg_parser.cc', 464 'filters/jpeg_parser.cc',
467 'filters/jpeg_parser.h', 465 'filters/jpeg_parser.h',
468 'filters/opus_audio_decoder.cc', 466 'filters/opus_audio_decoder.cc',
469 'filters/opus_audio_decoder.h', 467 'filters/opus_audio_decoder.h',
470 'filters/renderer_impl.cc', 468 'filters/renderer_impl.cc',
471 'filters/renderer_impl.h', 469 'filters/renderer_impl.h',
472 'filters/skcanvas_video_renderer.cc',
473 'filters/skcanvas_video_renderer.h',
474 'filters/source_buffer_range.cc', 470 'filters/source_buffer_range.cc',
475 'filters/source_buffer_range.h', 471 'filters/source_buffer_range.h',
476 'filters/source_buffer_stream.cc', 472 'filters/source_buffer_stream.cc',
477 'filters/source_buffer_stream.h', 473 'filters/source_buffer_stream.h',
478 'filters/stream_parser_factory.cc', 474 'filters/stream_parser_factory.cc',
479 'filters/stream_parser_factory.h', 475 'filters/stream_parser_factory.h',
480 'filters/video_frame_scheduler.h', 476 'filters/video_frame_scheduler.h',
481 'filters/video_frame_scheduler_impl.cc', 477 'filters/video_frame_scheduler_impl.cc',
482 'filters/video_frame_scheduler_impl.h', 478 'filters/video_frame_scheduler_impl.h',
483 'filters/video_frame_scheduler_proxy.cc', 479 'filters/video_frame_scheduler_proxy.cc',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 'midi/usb_midi_input_stream.h', 517 'midi/usb_midi_input_stream.h',
522 'midi/usb_midi_jack.h', 518 'midi/usb_midi_jack.h',
523 'midi/usb_midi_output_stream.cc', 519 'midi/usb_midi_output_stream.cc',
524 'midi/usb_midi_output_stream.h', 520 'midi/usb_midi_output_stream.h',
525 'ozone/media_ozone_platform.cc', 521 'ozone/media_ozone_platform.cc',
526 'ozone/media_ozone_platform.h', 522 'ozone/media_ozone_platform.h',
527 'video/capture/android/video_capture_device_android.cc', 523 'video/capture/android/video_capture_device_android.cc',
528 'video/capture/android/video_capture_device_android.h', 524 'video/capture/android/video_capture_device_android.h',
529 'video/capture/android/video_capture_device_factory_android.cc', 525 'video/capture/android/video_capture_device_factory_android.cc',
530 'video/capture/android/video_capture_device_factory_android.h', 526 'video/capture/android/video_capture_device_factory_android.h',
531 'video/capture/fake_video_capture_device.cc',
532 'video/capture/fake_video_capture_device.h',
533 'video/capture/fake_video_capture_device_factory.h',
534 'video/capture/fake_video_capture_device_factory.cc',
535 'video/capture/file_video_capture_device.cc', 527 'video/capture/file_video_capture_device.cc',
536 'video/capture/file_video_capture_device.h', 528 'video/capture/file_video_capture_device.h',
537 'video/capture/file_video_capture_device_factory.h',
538 'video/capture/file_video_capture_device_factory.cc',
539 'video/capture/linux/video_capture_device_factory_linux.cc',
540 'video/capture/linux/video_capture_device_factory_linux.h',
541 'video/capture/linux/video_capture_device_linux.cc', 529 'video/capture/linux/video_capture_device_linux.cc',
542 'video/capture/linux/video_capture_device_linux.h', 530 'video/capture/linux/video_capture_device_linux.h',
543 'video/capture/linux/video_capture_device_chromeos.cc', 531 'video/capture/linux/video_capture_device_chromeos.cc',
544 'video/capture/linux/video_capture_device_chromeos.h', 532 'video/capture/linux/video_capture_device_chromeos.h',
545 'video/capture/mac/platform_video_capturing_mac.h', 533 'video/capture/mac/platform_video_capturing_mac.h',
546 'video/capture/mac/video_capture_device_avfoundation_mac.h', 534 'video/capture/mac/video_capture_device_avfoundation_mac.h',
547 'video/capture/mac/video_capture_device_avfoundation_mac.mm', 535 'video/capture/mac/video_capture_device_avfoundation_mac.mm',
548 'video/capture/mac/video_capture_device_decklink_mac.h', 536 'video/capture/mac/video_capture_device_decklink_mac.h',
549 'video/capture/mac/video_capture_device_decklink_mac.mm', 537 'video/capture/mac/video_capture_device_decklink_mac.mm',
550 'video/capture/mac/video_capture_device_factory_mac.h', 538 'video/capture/mac/video_capture_device_factory_mac.h',
551 'video/capture/mac/video_capture_device_factory_mac.mm', 539 'video/capture/mac/video_capture_device_factory_mac.mm',
552 'video/capture/mac/video_capture_device_mac.h', 540 'video/capture/mac/video_capture_device_mac.h',
553 'video/capture/mac/video_capture_device_mac.mm', 541 'video/capture/mac/video_capture_device_mac.mm',
554 'video/capture/mac/video_capture_device_qtkit_mac.h', 542 'video/capture/mac/video_capture_device_qtkit_mac.h',
555 'video/capture/mac/video_capture_device_qtkit_mac.mm', 543 'video/capture/mac/video_capture_device_qtkit_mac.mm',
556 'video/capture/video_capture_device.cc', 544 'video/capture/video_capture_device.cc',
557 'video/capture/video_capture_device.h', 545 'video/capture/video_capture_device.h',
558 'video/capture/video_capture_device_factory.cc',
559 'video/capture/video_capture_device_factory.h',
560 'video/capture/video_capture_device_info.cc', 546 'video/capture/video_capture_device_info.cc',
561 'video/capture/video_capture_device_info.h', 547 'video/capture/video_capture_device_info.h',
562 'video/capture/video_capture_types.cc', 548 'video/capture/video_capture_types.cc',
563 'video/capture/video_capture_types.h', 549 'video/capture/video_capture_types.h',
564 'video/capture/win/capability_list_win.cc', 550 'video/capture/win/capability_list_win.cc',
565 'video/capture/win/capability_list_win.h', 551 'video/capture/win/capability_list_win.h',
566 'video/capture/win/filter_base_win.cc', 552 'video/capture/win/filter_base_win.cc',
567 'video/capture/win/filter_base_win.h', 553 'video/capture/win/filter_base_win.h',
568 'video/capture/win/pin_base_win.cc', 554 'video/capture/win/pin_base_win.cc',
569 'video/capture/win/pin_base_win.h', 555 'video/capture/win/pin_base_win.h',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 'formats/webm/webm_video_client.h', 600 'formats/webm/webm_video_client.h',
615 'formats/webm/webm_webvtt_parser.cc', 601 'formats/webm/webm_webvtt_parser.cc',
616 'formats/webm/webm_webvtt_parser.h' 602 'formats/webm/webm_webvtt_parser.h'
617 ], 603 ],
618 'direct_dependent_settings': { 604 'direct_dependent_settings': {
619 'include_dirs': [ 605 'include_dirs': [
620 '..', 606 '..',
621 ], 607 ],
622 }, 608 },
623 'conditions': [ 609 'conditions': [
610 ['is_ensemble==0', {
611 # Add the sources and dependencies that need X11, font, or graphics
612 # libraries.
613 'dependencies': [
614 '../skia/skia.gyp:skia',
615 '../ui/events/events.gyp:events_base',
616 '../ui/gfx/gfx.gyp:gfx',
617 ],
618 'sources': [
619 'filters/gpu_video_decoder.cc',
620 'filters/gpu_video_decoder.h',
621 'filters/skcanvas_video_renderer.cc',
622 'filters/skcanvas_video_renderer.h',
623 'video/capture/fake_video_capture_device.cc',
624 'video/capture/fake_video_capture_device.h',
625 'video/capture/fake_video_capture_device_factory.cc',
626 'video/capture/fake_video_capture_device_factory.h',
627 'video/capture/file_video_capture_device_factory.cc',
628 'video/capture/file_video_capture_device_factory.h',
629 'video/capture/linux/video_capture_device_factory_linux.cc',
630 'video/capture/linux/video_capture_device_factory_linux.h',
631 'video/capture/video_capture_device_factory.cc',
632 'video/capture/video_capture_device_factory.h',
633 ],
634 }, { # is_ensemble==1
635 # Exclude the sources that need X11, font, or graphics libraries.
636 'sources!': [
637 'filters/default_renderer_factory.cc',
638 'filters/default_renderer_factory.h',
wtc 2015/02/12 02:17:45 These two files are excluded rather than added bec
639 ],
640 }],
624 ['arm_neon==1', { 641 ['arm_neon==1', {
625 'defines': [ 642 'defines': [
626 'USE_NEON' 643 'USE_NEON'
627 ], 644 ],
628 }], 645 }],
629 ['media_use_ffmpeg==1', { 646 ['media_use_ffmpeg==1', {
630 'dependencies': [ 647 'dependencies': [
631 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 648 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
632 ], 649 ],
633 }, { # media_use_ffmpeg==0 650 }, { # media_use_ffmpeg==0
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 ], 766 ],
750 }], 767 }],
751 ['OS!="openbsd"', { 768 ['OS!="openbsd"', {
752 'sources!': [ 769 'sources!': [
753 'audio/openbsd/audio_manager_openbsd.cc', 770 'audio/openbsd/audio_manager_openbsd.cc',
754 'audio/openbsd/audio_manager_openbsd.h', 771 'audio/openbsd/audio_manager_openbsd.h',
755 ], 772 ],
756 }], 773 }],
757 ['OS=="linux"', { 774 ['OS=="linux"', {
758 'conditions': [ 775 'conditions': [
759 ['use_x11==1', { 776 ['use_x11==1 and is_ensemble==0', {
760 'dependencies': [ 777 'dependencies': [
761 '../build/linux/system.gyp:x11', 778 '../build/linux/system.gyp:x11',
762 '../build/linux/system.gyp:xdamage', 779 '../build/linux/system.gyp:xdamage',
763 '../build/linux/system.gyp:xext', 780 '../build/linux/system.gyp:xext',
764 '../build/linux/system.gyp:xfixes', 781 '../build/linux/system.gyp:xfixes',
765 '../build/linux/system.gyp:xtst', 782 '../build/linux/system.gyp:xtst',
766 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 783 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
767 ], 784 ],
768 }, { # else: use_x11==0 785 }, { # else: use_x11==0 or is_ensemble==1
769 'sources!': [ 786 'sources!': [
770 'base/user_input_monitor_linux.cc', 787 'base/user_input_monitor_linux.cc',
771 ], 788 ],
772 'defines': [ 789 'defines': [
773 'DISABLE_USER_INPUT_MONITOR', 790 'DISABLE_USER_INPUT_MONITOR',
774 ], 791 ],
775 }], 792 }],
776 ['use_cras==1', { 793 ['use_cras==1', {
777 'cflags': [ 794 'cflags': [
778 '<!@(<(pkg-config) --cflags libcras)', 795 '<!@(<(pkg-config) --cflags libcras)',
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 '../build/isolate.gypi', 1945 '../build/isolate.gypi',
1929 ], 1946 ],
1930 'sources': [ 1947 'sources': [
1931 'media_unittests.isolate', 1948 'media_unittests.isolate',
1932 ], 1949 ],
1933 }, 1950 },
1934 ], 1951 ],
1935 }], 1952 }],
1936 ], 1953 ],
1937 } 1954 }
OLDNEW
« media/BUILD.gn ('K') | « media/base/BUILD.gn ('k') | media/media_options.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698