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

Side by Side Diff: trunk/src/media/media.gyp

Issue 17176031: Revert 207992: This looks like a reland of r207983, which was reverted in (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/ipc/ipc_message_start.h ('k') | trunk/src/media/midi/midi_manager.h » ('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 (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
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 'filters/stream_parser_factory.cc', 366 'filters/stream_parser_factory.cc',
367 'filters/stream_parser_factory.h', 367 'filters/stream_parser_factory.h',
368 'filters/video_decoder_selector.cc', 368 'filters/video_decoder_selector.cc',
369 'filters/video_decoder_selector.h', 369 'filters/video_decoder_selector.h',
370 'filters/video_frame_stream.cc', 370 'filters/video_frame_stream.cc',
371 'filters/video_frame_stream.h', 371 'filters/video_frame_stream.h',
372 'filters/video_renderer_base.cc', 372 'filters/video_renderer_base.cc',
373 'filters/video_renderer_base.h', 373 'filters/video_renderer_base.h',
374 'filters/vpx_video_decoder.cc', 374 'filters/vpx_video_decoder.cc',
375 'filters/vpx_video_decoder.h', 375 'filters/vpx_video_decoder.h',
376 'midi/midi_manager.h',
377 'midi/midi_manager.cc',
378 'midi/midi_manager_mac.h',
379 'midi/midi_manager_mac.cc',
380 'midi/midi_port_info.h',
381 'midi/midi_port_info.cc',
382 'video/capture/android/video_capture_device_android.cc', 376 'video/capture/android/video_capture_device_android.cc',
383 'video/capture/android/video_capture_device_android.h', 377 'video/capture/android/video_capture_device_android.h',
384 'video/capture/fake_video_capture_device.cc', 378 'video/capture/fake_video_capture_device.cc',
385 'video/capture/fake_video_capture_device.h', 379 'video/capture/fake_video_capture_device.h',
386 'video/capture/linux/video_capture_device_linux.cc', 380 'video/capture/linux/video_capture_device_linux.cc',
387 'video/capture/linux/video_capture_device_linux.h', 381 'video/capture/linux/video_capture_device_linux.h',
388 'video/capture/mac/video_capture_device_mac.h', 382 'video/capture/mac/video_capture_device_mac.h',
389 'video/capture/mac/video_capture_device_mac.mm', 383 'video/capture/mac/video_capture_device_mac.mm',
390 'video/capture/mac/video_capture_device_qtkit_mac.h', 384 'video/capture/mac/video_capture_device_qtkit_mac.h',
391 'video/capture/mac/video_capture_device_qtkit_mac.mm', 385 'video/capture/mac/video_capture_device_qtkit_mac.mm',
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 ['include', '^base/media\\.cc$'], 528 ['include', '^base/media\\.cc$'],
535 ['include', '^base/media_stub\\.cc$'], 529 ['include', '^base/media_stub\\.cc$'],
536 ['include', '^base/media_switches\\.'], 530 ['include', '^base/media_switches\\.'],
537 ['include', '^base/vector_math\\.'], 531 ['include', '^base/vector_math\\.'],
538 ], 532 ],
539 'link_settings': { 533 'link_settings': {
540 'libraries': [ 534 'libraries': [
541 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 535 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
542 '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework', 536 '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
543 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 537 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
544 '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
545 ], 538 ],
546 }, 539 },
547 }], 540 }],
548 ['OS=="android"', { 541 ['OS=="android"', {
549 'link_settings': { 542 'link_settings': {
550 'libraries': [ 543 'libraries': [
551 '-lOpenSLES', 544 '-lOpenSLES',
552 ], 545 ],
553 }, 546 },
554 'include_dirs': [ 547 'include_dirs': [
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 'video/capture/video_capture_device_dummy.cc', 740 'video/capture/video_capture_device_dummy.cc',
748 'video/capture/video_capture_device_dummy.h', 741 'video/capture/video_capture_device_dummy.h',
749 ], 742 ],
750 }], 743 }],
751 ['OS=="mac"', { 744 ['OS=="mac"', {
752 'link_settings': { 745 'link_settings': {
753 'libraries': [ 746 'libraries': [
754 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 747 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
755 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 748 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
756 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 749 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
757 '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
758 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', 750 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
759 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 751 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
760 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework', 752 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
761 ], 753 ],
762 }, 754 },
763 }], 755 }],
764 ['OS=="win"', { 756 ['OS=="win"', {
765 'sources!': [ 757 'sources!': [
766 'video/capture/video_capture_device_dummy.cc', 758 'video/capture/video_capture_device_dummy.cc',
767 'video/capture/video_capture_device_dummy.h', 759 'video/capture/video_capture_device_dummy.h',
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 'sources': [ 1613 'sources': [
1622 'tools/media_bench/media_bench.cc', 1614 'tools/media_bench/media_bench.cc',
1623 ], 1615 ],
1624 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1616 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1625 'msvs_disabled_warnings': [ 4267, ], 1617 'msvs_disabled_warnings': [ 4267, ],
1626 }, 1618 },
1627 ], 1619 ],
1628 }], 1620 }],
1629 ], 1621 ],
1630 } 1622 }
OLDNEW
« no previous file with comments | « trunk/src/ipc/ipc_message_start.h ('k') | trunk/src/media/midi/midi_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698