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

Side by Side Diff: media/media.gyp

Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review. Please diff against PS1 for easy life. Created 6 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
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 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 'defines': [ 602 'defines': [
603 'MEDIA_DISABLE_LIBVPX', 603 'MEDIA_DISABLE_LIBVPX',
604 ], 604 ],
605 }, 605 },
606 # Exclude the sources that depend on libvpx. 606 # Exclude the sources that depend on libvpx.
607 'sources!': [ 607 'sources!': [
608 'filters/vpx_video_decoder.cc', 608 'filters/vpx_video_decoder.cc',
609 'filters/vpx_video_decoder.h', 609 'filters/vpx_video_decoder.h',
610 ], 610 ],
611 }], 611 }],
612 ['enable_browser_cdms==1', {
613 'sources': [
614 'base/browser_cdm.cc',
615 'base/browser_cdm.h',
616 'base/browser_cdm_factory.h',
617 ],
618 }],
612 ['OS=="android"', { 619 ['OS=="android"', {
613 'dependencies': [ 620 'dependencies': [
614 'media_android_jni_headers', 621 'media_android_jni_headers',
615 'player_android', 622 'player_android',
616 'video_capture_android_jni_headers', 623 'video_capture_android_jni_headers',
617 ], 624 ],
618 'sources': [ 625 'sources': [
619 'base/media.cc', 626 'base/media.cc',
620 'base/media.h', 627 'base/media.h',
621 'base/media_stub.cc', 628 'base/media_stub.cc',
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1589 'base/android/media_player_bridge.h', 1596 'base/android/media_player_bridge.h',
1590 'base/android/media_player_listener.cc', 1597 'base/android/media_player_listener.cc',
1591 'base/android/media_player_listener.h', 1598 'base/android/media_player_listener.h',
1592 'base/android/media_source_player.cc', 1599 'base/android/media_source_player.cc',
1593 'base/android/media_source_player.h', 1600 'base/android/media_source_player.h',
1594 'base/android/video_decoder_job.cc', 1601 'base/android/video_decoder_job.cc',
1595 'base/android/video_decoder_job.h', 1602 'base/android/video_decoder_job.h',
1596 'base/android/webaudio_media_codec_bridge.cc', 1603 'base/android/webaudio_media_codec_bridge.cc',
1597 'base/android/webaudio_media_codec_bridge.h', 1604 'base/android/webaudio_media_codec_bridge.h',
1598 'base/android/webaudio_media_codec_info.h', 1605 'base/android/webaudio_media_codec_info.h',
1599 'base/browser_cdm.cc',
1600 'base/browser_cdm.h',
1601 'base/browser_cdm_factory.h',
1602 ], 1606 ],
1603 'dependencies': [ 1607 'dependencies': [
1604 '../base/base.gyp:base', 1608 '../base/base.gyp:base',
1605 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ', 1609 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ',
1606 '../ui/gl/gl.gyp:gl', 1610 '../ui/gl/gl.gyp:gl',
1607 '../url/url.gyp:url_lib', 1611 '../url/url.gyp:url_lib',
1608 'media_android_jni_headers', 1612 'media_android_jni_headers',
1609 ], 1613 ],
1610 'include_dirs': [ 1614 'include_dirs': [
1611 # Needed by media_drm_bridge.cc. 1615 # Needed by media_drm_bridge.cc.
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 ], 1693 ],
1690 }], 1694 }],
1691 ], 1695 ],
1692 }], 1696 }],
1693 ], 1697 ],
1694 }, 1698 },
1695 ], 1699 ],
1696 }], 1700 }],
1697 ], 1701 ],
1698 } 1702 }
OLDNEW
« content/renderer/render_frame_impl.cc ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698