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

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

Issue 405803007: Revert 284489 "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 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after
1349 }], 1349 }],
1350 ], 1350 ],
1351 }, 1351 },
1352 { 1352 {
1353 'target_name': 'media_test_support', 1353 'target_name': 'media_test_support',
1354 'type': 'static_library', 1354 'type': 'static_library',
1355 'dependencies': [ 1355 'dependencies': [
1356 'media', 1356 'media',
1357 'shared_memory_support', 1357 'shared_memory_support',
1358 '../base/base.gyp:base', 1358 '../base/base.gyp:base',
1359 '../net/net.gyp:net_test_support',
1360 '../skia/skia.gyp:skia', 1359 '../skia/skia.gyp:skia',
1361 '../testing/gmock.gyp:gmock', 1360 '../testing/gmock.gyp:gmock',
1362 '../testing/gtest.gyp:gtest', 1361 '../testing/gtest.gyp:gtest',
1363 ], 1362 ],
1364 'sources': [ 1363 'sources': [
1365 'audio/mock_audio_manager.cc', 1364 'audio/mock_audio_manager.cc',
1366 'audio/mock_audio_manager.h', 1365 'audio/mock_audio_manager.h',
1367 'audio/mock_audio_source_callback.cc', 1366 'audio/mock_audio_source_callback.cc',
1368 'audio/mock_audio_source_callback.h', 1367 'audio/mock_audio_source_callback.h',
1369 'audio/test_audio_input_controller_factory.cc', 1368 'audio/test_audio_input_controller_factory.cc',
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1762 ], 1761 ],
1763 }], 1762 }],
1764 ], 1763 ],
1765 }], 1764 }],
1766 ], 1765 ],
1767 }, 1766 },
1768 ], 1767 ],
1769 }], 1768 }],
1770 ], 1769 ],
1771 } 1770 }
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