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

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

Issue 383063009: Revert 282795 "Have media content and chrome browser tests load ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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/media/base/test_data_util.cc ('k') | trunk/src/media/test/data/blackwhite.html » ('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 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 }], 1342 }],
1343 ], 1343 ],
1344 }, 1344 },
1345 { 1345 {
1346 'target_name': 'media_test_support', 1346 'target_name': 'media_test_support',
1347 'type': 'static_library', 1347 'type': 'static_library',
1348 'dependencies': [ 1348 'dependencies': [
1349 'media', 1349 'media',
1350 'shared_memory_support', 1350 'shared_memory_support',
1351 '../base/base.gyp:base', 1351 '../base/base.gyp:base',
1352 '../net/net.gyp:net_test_support',
1353 '../skia/skia.gyp:skia', 1352 '../skia/skia.gyp:skia',
1354 '../testing/gmock.gyp:gmock', 1353 '../testing/gmock.gyp:gmock',
1355 '../testing/gtest.gyp:gtest', 1354 '../testing/gtest.gyp:gtest',
1356 ], 1355 ],
1357 'sources': [ 1356 'sources': [
1358 'audio/mock_audio_manager.cc', 1357 'audio/mock_audio_manager.cc',
1359 'audio/mock_audio_manager.h', 1358 'audio/mock_audio_manager.h',
1360 'audio/mock_audio_source_callback.cc', 1359 'audio/mock_audio_source_callback.cc',
1361 'audio/mock_audio_source_callback.h', 1360 'audio/mock_audio_source_callback.h',
1362 'audio/test_audio_input_controller_factory.cc', 1361 'audio/test_audio_input_controller_factory.cc',
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1755 ], 1754 ],
1756 }], 1755 }],
1757 ], 1756 ],
1758 }], 1757 }],
1759 ], 1758 ],
1760 }, 1759 },
1761 ], 1760 ],
1762 }], 1761 }],
1763 ], 1762 ],
1764 } 1763 }
OLDNEW
« no previous file with comments | « trunk/src/media/base/test_data_util.cc ('k') | trunk/src/media/test/data/blackwhite.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698