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

Side by Side Diff: media/media.gyp

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 9 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 | « media/base/android/media_source_player_unittest.cc ('k') | no next file » | 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 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 'media', 906 'media',
907 'media_test_support', 907 'media_test_support',
908 'shared_memory_support', 908 'shared_memory_support',
909 '../base/base.gyp:base', 909 '../base/base.gyp:base',
910 '../base/base.gyp:base_i18n', 910 '../base/base.gyp:base_i18n',
911 '../base/base.gyp:test_support_base', 911 '../base/base.gyp:test_support_base',
912 '../gpu/gpu.gyp:command_buffer_common', 912 '../gpu/gpu.gyp:command_buffer_common',
913 '../skia/skia.gyp:skia', 913 '../skia/skia.gyp:skia',
914 '../testing/gmock.gyp:gmock', 914 '../testing/gmock.gyp:gmock',
915 '../testing/gtest.gyp:gtest', 915 '../testing/gtest.gyp:gtest',
916 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
916 '../ui/gfx/gfx.gyp:gfx', 917 '../ui/gfx/gfx.gyp:gfx',
917 '../ui/gfx/gfx.gyp:gfx_geometry', 918 '../ui/gfx/gfx.gyp:gfx_geometry',
918 '../ui/ui.gyp:ui', 919 '../ui/ui.gyp:ui',
919 ], 920 ],
920 'sources': [ 921 'sources': [
921 'audio/android/audio_android_unittest.cc', 922 'audio/android/audio_android_unittest.cc',
922 'audio/alsa/alsa_output_unittest.cc', 923 'audio/alsa/alsa_output_unittest.cc',
923 'audio/audio_input_controller_unittest.cc', 924 'audio/audio_input_controller_unittest.cc',
924 'audio/audio_input_unittest.cc', 925 'audio/audio_input_unittest.cc',
925 'audio/audio_input_volume_unittest.cc', 926 'audio/audio_input_volume_unittest.cc',
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 'formats/webm/cluster_builder.cc', 1040 'formats/webm/cluster_builder.cc',
1040 'formats/webm/cluster_builder.h', 1041 'formats/webm/cluster_builder.h',
1041 'formats/webm/tracks_builder.cc', 1042 'formats/webm/tracks_builder.cc',
1042 'formats/webm/tracks_builder.h', 1043 'formats/webm/tracks_builder.h',
1043 'formats/webm/webm_cluster_parser_unittest.cc', 1044 'formats/webm/webm_cluster_parser_unittest.cc',
1044 'formats/webm/webm_content_encodings_client_unittest.cc', 1045 'formats/webm/webm_content_encodings_client_unittest.cc',
1045 'formats/webm/webm_parser_unittest.cc', 1046 'formats/webm/webm_parser_unittest.cc',
1046 'formats/webm/webm_tracks_parser_unittest.cc', 1047 'formats/webm/webm_tracks_parser_unittest.cc',
1047 'formats/webm/webm_webvtt_parser_unittest.cc', 1048 'formats/webm/webm_webvtt_parser_unittest.cc',
1048 ], 1049 ],
1050 'include_dirs': [
1051 # Needed by media_drm_bridge.cc.
1052 '<(SHARED_INTERMEDIATE_DIR)',
1053 ],
1049 'conditions': [ 1054 'conditions': [
1050 ['arm_neon==1', { 1055 ['arm_neon==1', {
1051 'defines': [ 1056 'defines': [
1052 'USE_NEON' 1057 'USE_NEON'
1053 ], 1058 ],
1054 }], 1059 }],
1055 ['media_use_ffmpeg==1', { 1060 ['media_use_ffmpeg==1', {
1056 'dependencies': [ 1061 'dependencies': [
1057 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1062 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1058 ], 1063 ],
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1568 'base/android/media_source_player.cc', 1573 'base/android/media_source_player.cc',
1569 'base/android/media_source_player.h', 1574 'base/android/media_source_player.h',
1570 'base/android/video_decoder_job.cc', 1575 'base/android/video_decoder_job.cc',
1571 'base/android/video_decoder_job.h', 1576 'base/android/video_decoder_job.h',
1572 'base/android/webaudio_media_codec_bridge.cc', 1577 'base/android/webaudio_media_codec_bridge.cc',
1573 'base/android/webaudio_media_codec_bridge.h', 1578 'base/android/webaudio_media_codec_bridge.h',
1574 'base/android/webaudio_media_codec_info.h', 1579 'base/android/webaudio_media_codec_info.h',
1575 ], 1580 ],
1576 'dependencies': [ 1581 'dependencies': [
1577 '../base/base.gyp:base', 1582 '../base/base.gyp:base',
1583 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ',
1578 '../ui/gl/gl.gyp:gl', 1584 '../ui/gl/gl.gyp:gl',
1579 '../url/url.gyp:url_lib', 1585 '../url/url.gyp:url_lib',
1580 'media_android_jni_headers', 1586 'media_android_jni_headers',
1581 ], 1587 ],
1588 'include_dirs': [
1589 # Needed by media_drm_bridge.cc.
1590 '<(SHARED_INTERMEDIATE_DIR)',
1591 ],
1582 'defines': [ 1592 'defines': [
1583 'MEDIA_IMPLEMENTATION', 1593 'MEDIA_IMPLEMENTATION',
1584 ], 1594 ],
1585 }, 1595 },
1586 { 1596 {
1587 'target_name': 'media_java', 1597 'target_name': 'media_java',
1588 'type': 'none', 1598 'type': 'none',
1589 'dependencies': [ 1599 'dependencies': [
1590 '../base/base.gyp:base', 1600 '../base/base.gyp:base',
1591 'media_android_imageformat_list', 1601 'media_android_imageformat_list',
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1674 ], 1684 ],
1675 }], 1685 }],
1676 ], 1686 ],
1677 }], 1687 }],
1678 ], 1688 ],
1679 }, 1689 },
1680 ], 1690 ],
1681 }], 1691 }],
1682 ], 1692 ],
1683 } 1693 }
OLDNEW
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698