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

Side by Side Diff: media/media.gyp

Issue 83243007: Remove unnecessary dependencies on 'ui' target from media targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add back ui.gyp 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 | Annotate | Revision Log
« 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 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 'type': '<(gtest_target_type)', 1115 'type': '<(gtest_target_type)',
1116 'dependencies': [ 1116 'dependencies': [
1117 'media', 1117 'media',
1118 'media_test_support', 1118 'media_test_support',
1119 'shared_memory_support', 1119 'shared_memory_support',
1120 '../base/base.gyp:test_support_base', 1120 '../base/base.gyp:test_support_base',
1121 '../testing/gmock.gyp:gmock', 1121 '../testing/gmock.gyp:gmock',
1122 '../testing/gtest.gyp:gtest', 1122 '../testing/gtest.gyp:gtest',
1123 '../testing/perf/perf_test.gyp:perf_test', 1123 '../testing/perf/perf_test.gyp:perf_test',
1124 '../ui/gfx/gfx.gyp:gfx', 1124 '../ui/gfx/gfx.gyp:gfx',
1125 '../ui/ui.gyp:ui',
1126 '../ui/gl/gl.gyp:gl', 1125 '../ui/gl/gl.gyp:gl',
1127 ], 1126 ],
1128 'sources': [ 1127 'sources': [
1129 'base/audio_bus_perftest.cc', 1128 'base/audio_bus_perftest.cc',
1130 'base/audio_converter_perftest.cc', 1129 'base/audio_converter_perftest.cc',
1131 'base/demuxer_perftest.cc', 1130 'base/demuxer_perftest.cc',
1132 'base/run_all_unittests.cc', 1131 'base/run_all_unittests.cc',
1133 'base/sinc_resampler_perftest.cc', 1132 'base/sinc_resampler_perftest.cc',
1134 'base/test_data_util.cc', 1133 'base/test_data_util.cc',
1135 'base/vector_math_perftest.cc', 1134 'base/vector_math_perftest.cc',
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 ['use_x11==1', { 1396 ['use_x11==1', {
1398 'targets': [ 1397 'targets': [
1399 { 1398 {
1400 'target_name': 'player_x11', 1399 'target_name': 'player_x11',
1401 'type': 'executable', 1400 'type': 'executable',
1402 'dependencies': [ 1401 'dependencies': [
1403 'media', 1402 'media',
1404 '../base/base.gyp:base', 1403 '../base/base.gyp:base',
1405 '../ui/gl/gl.gyp:gl', 1404 '../ui/gl/gl.gyp:gl',
1406 '../ui/gfx/gfx.gyp:gfx', 1405 '../ui/gfx/gfx.gyp:gfx',
1407 '../ui/ui.gyp:ui',
1408 ], 1406 ],
1409 'link_settings': { 1407 'link_settings': {
1410 'libraries': [ 1408 'libraries': [
1411 '-lX11', 1409 '-lX11',
1412 '-lXrender', 1410 '-lXrender',
1413 '-lXext', 1411 '-lXext',
1414 ], 1412 ],
1415 }, 1413 },
1416 'conditions': [ 1414 'conditions': [
1417 # Linux/Solaris need libdl for dlopen() and friends. 1415 # Linux/Solaris need libdl for dlopen() and friends.
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 ], 1630 ],
1633 }], 1631 }],
1634 ], 1632 ],
1635 }], 1633 }],
1636 ], 1634 ],
1637 }, 1635 },
1638 ], 1636 ],
1639 }], 1637 }],
1640 ], 1638 ],
1641 } 1639 }
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