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

Side by Side Diff: media/media.gyp

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix 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 | « jingle/jingle.gyp ('k') | net/net.gyp » ('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 28 matching lines...) Expand all
39 'use_pulseaudio%': 0, 39 'use_pulseaudio%': 0,
40 }], 40 }],
41 ], 41 ],
42 }, 42 },
43 'targets': [ 43 'targets': [
44 { 44 {
45 'target_name': 'media', 45 'target_name': 'media',
46 'type': '<(component)', 46 'type': '<(component)',
47 'dependencies': [ 47 'dependencies': [
48 '../base/base.gyp:base', 48 '../base/base.gyp:base',
49 '../build/temp_gyp/googleurl.gyp:googleurl',
50 '../crypto/crypto.gyp:crypto', 49 '../crypto/crypto.gyp:crypto',
51 '../skia/skia.gyp:skia', 50 '../skia/skia.gyp:skia',
52 '../third_party/opus/opus.gyp:opus', 51 '../third_party/opus/opus.gyp:opus',
53 '../ui/ui.gyp:ui', 52 '../ui/ui.gyp:ui',
53 '../url/url.gyp:url_lib',
54 ], 54 ],
55 'defines': [ 55 'defines': [
56 'MEDIA_IMPLEMENTATION', 56 'MEDIA_IMPLEMENTATION',
57 ], 57 ],
58 'include_dirs': [ 58 'include_dirs': [
59 '..', 59 '..',
60 ], 60 ],
61 'sources': [ 61 'sources': [
62 'audio/agc_audio_stream.h', 62 'audio/agc_audio_stream.h',
63 'audio/android/audio_manager_android.cc', 63 'audio/android/audio_manager_android.cc',
(...skipping 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1703 'sources': [ 1703 'sources': [
1704 'tools/media_bench/media_bench.cc', 1704 'tools/media_bench/media_bench.cc',
1705 ], 1705 ],
1706 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1706 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1707 'msvs_disabled_warnings': [ 4267, ], 1707 'msvs_disabled_warnings': [ 4267, ],
1708 }, 1708 },
1709 ], 1709 ],
1710 }], 1710 }],
1711 ], 1711 ],
1712 } 1712 }
OLDNEW
« no previous file with comments | « jingle/jingle.gyp ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698