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

Side by Side Diff: media/media.gyp

Issue 16737007: Make it possible to switch between two different versions of ANGLE. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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
« content/DEPS ('K') | « gpu/gpu.gyp ('k') | webkit/DEPS » ('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 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 ['toolkit_uses_gtk==1', { 1381 ['toolkit_uses_gtk==1', {
1382 'dependencies': [ 1382 'dependencies': [
1383 '../build/linux/system.gyp:gtk', 1383 '../build/linux/system.gyp:gtk',
1384 ], 1384 ],
1385 'sources': [ 1385 'sources': [
1386 'tools/shader_bench/window_linux.cc', 1386 'tools/shader_bench/window_linux.cc',
1387 ], 1387 ],
1388 }], 1388 }],
1389 ['OS=="win"', { 1389 ['OS=="win"', {
1390 'dependencies': [ 1390 'dependencies': [
1391 '../third_party/angle/src/build_angle.gyp:libEGL', 1391 '<(angle_path)/src/build_angle.gyp:libEGL',
1392 '../third_party/angle/src/build_angle.gyp:libGLESv2', 1392 '<(angle_path)/src/build_angle.gyp:libGLESv2',
1393 ], 1393 ],
1394 'sources': [ 1394 'sources': [
1395 'tools/shader_bench/window_win.cc', 1395 'tools/shader_bench/window_win.cc',
1396 ], 1396 ],
1397 }], 1397 }],
1398 # See http://crbug.com/162998#c4 for why this is needed. 1398 # See http://crbug.com/162998#c4 for why this is needed.
1399 ['OS=="linux" and linux_use_tcmalloc==1', { 1399 ['OS=="linux" and linux_use_tcmalloc==1', {
1400 'dependencies': [ 1400 'dependencies': [
1401 '../base/allocator/allocator.gyp:allocator', 1401 '../base/allocator/allocator.gyp:allocator',
1402 ], 1402 ],
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1642 'sources': [ 1642 'sources': [
1643 'tools/media_bench/media_bench.cc', 1643 'tools/media_bench/media_bench.cc',
1644 ], 1644 ],
1645 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1645 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1646 'msvs_disabled_warnings': [ 4267, ], 1646 'msvs_disabled_warnings': [ 4267, ],
1647 }, 1647 },
1648 ], 1648 ],
1649 }], 1649 }],
1650 ], 1650 ],
1651 } 1651 }
OLDNEW
« content/DEPS ('K') | « gpu/gpu.gyp ('k') | webkit/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698