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

Side by Side Diff: media/media.gyp

Issue 18161007: Replace angle_path gyp variable with regular path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d3d11
Patch Set: rebase Created 7 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
« no previous file with comments | « 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 1365 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 ['toolkit_uses_gtk==1', { 1376 ['toolkit_uses_gtk==1', {
1377 'dependencies': [ 1377 'dependencies': [
1378 '../build/linux/system.gyp:gtk', 1378 '../build/linux/system.gyp:gtk',
1379 ], 1379 ],
1380 'sources': [ 1380 'sources': [
1381 'tools/shader_bench/window_linux.cc', 1381 'tools/shader_bench/window_linux.cc',
1382 ], 1382 ],
1383 }], 1383 }],
1384 ['OS=="win"', { 1384 ['OS=="win"', {
1385 'dependencies': [ 1385 'dependencies': [
1386 '<(angle_path)/src/build_angle.gyp:libEGL', 1386 '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
1387 '<(angle_path)/src/build_angle.gyp:libGLESv2', 1387 '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
1388 ], 1388 ],
1389 'sources': [ 1389 'sources': [
1390 'tools/shader_bench/window_win.cc', 1390 'tools/shader_bench/window_win.cc',
1391 ], 1391 ],
1392 }], 1392 }],
1393 # See http://crbug.com/162998#c4 for why this is needed. 1393 # See http://crbug.com/162998#c4 for why this is needed.
1394 ['OS=="linux" and linux_use_tcmalloc==1', { 1394 ['OS=="linux" and linux_use_tcmalloc==1', {
1395 'dependencies': [ 1395 'dependencies': [
1396 '../base/allocator/allocator.gyp:allocator', 1396 '../base/allocator/allocator.gyp:allocator',
1397 ], 1397 ],
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1620 'sources': [ 1620 'sources': [
1621 'tools/media_bench/media_bench.cc', 1621 'tools/media_bench/media_bench.cc',
1622 ], 1622 ],
1623 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1623 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1624 'msvs_disabled_warnings': [ 4267, ], 1624 'msvs_disabled_warnings': [ 4267, ],
1625 }, 1625 },
1626 ], 1626 ],
1627 }], 1627 }],
1628 ], 1628 ],
1629 } 1629 }
OLDNEW
« no previous file with comments | « gpu/gpu.gyp ('k') | webkit/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698