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

Side by Side Diff: media/media.gyp

Issue 111293002: Add ui back as a dependency of media_perftests. This fixes an Android failure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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
« no previous file with comments | « no previous file | 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 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 'dependencies': [ 1118 'dependencies': [
1119 'media', 1119 'media',
1120 'media_test_support', 1120 'media_test_support',
1121 'shared_memory_support', 1121 'shared_memory_support',
1122 '../base/base.gyp:test_support_base', 1122 '../base/base.gyp:test_support_base',
1123 '../testing/gmock.gyp:gmock', 1123 '../testing/gmock.gyp:gmock',
1124 '../testing/gtest.gyp:gtest', 1124 '../testing/gtest.gyp:gtest',
1125 '../testing/perf/perf_test.gyp:perf_test', 1125 '../testing/perf/perf_test.gyp:perf_test',
1126 '../ui/gfx/gfx.gyp:gfx', 1126 '../ui/gfx/gfx.gyp:gfx',
1127 '../ui/gl/gl.gyp:gl', 1127 '../ui/gl/gl.gyp:gl',
1128 '../ui/ui.gyp:ui',
1128 ], 1129 ],
1129 'sources': [ 1130 'sources': [
1130 'base/audio_bus_perftest.cc', 1131 'base/audio_bus_perftest.cc',
1131 'base/audio_converter_perftest.cc', 1132 'base/audio_converter_perftest.cc',
1132 'base/demuxer_perftest.cc', 1133 'base/demuxer_perftest.cc',
1133 'base/run_all_unittests.cc', 1134 'base/run_all_unittests.cc',
1134 'base/sinc_resampler_perftest.cc', 1135 'base/sinc_resampler_perftest.cc',
1135 'base/test_data_util.cc', 1136 'base/test_data_util.cc',
1136 'base/vector_math_perftest.cc', 1137 'base/vector_math_perftest.cc',
1137 'filters/pipeline_integration_perftest.cc', 1138 'filters/pipeline_integration_perftest.cc',
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 ], 1633 ],
1633 }], 1634 }],
1634 ], 1635 ],
1635 }], 1636 }],
1636 ], 1637 ],
1637 }, 1638 },
1638 ], 1639 ],
1639 }], 1640 }],
1640 ], 1641 ],
1641 } 1642 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698