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

Side by Side Diff: gpu/gpu.gyp

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zmo nits Created 5 years, 7 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/config/gpu_util.cc ('k') | gpu/gpu_config.gypi » ('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 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 'includes': [ 495 'includes': [
496 'command_buffer_service.gypi', 496 'command_buffer_service.gypi',
497 '../build/android/increase_size_for_speed.gypi', 497 '../build/android/increase_size_for_speed.gypi',
498 # Disable LTO due to ELF section name out of range 498 # Disable LTO due to ELF section name out of range
499 # crbug.com/422251 499 # crbug.com/422251
500 '../build/android/disable_lto.gypi', 500 '../build/android/disable_lto.gypi',
501 ], 501 ],
502 'dependencies': [ 502 'dependencies': [
503 'command_buffer_common', 503 'command_buffer_common',
504 'disk_cache_proto', 504 'disk_cache_proto',
505 'gpu_config',
505 ], 506 ],
506 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 507 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
507 'msvs_disabled_warnings': [4267, ], 508 'msvs_disabled_warnings': [4267, ],
508 }, 509 },
509 { 510 {
510 # GN version: //gpu/ipc 511 # GN version: //gpu/ipc
511 'target_name': 'gpu_ipc', 512 'target_name': 'gpu_ipc',
512 'type': 'static_library', 513 'type': 'static_library',
513 'includes': [ 514 'includes': [
514 'gpu_ipc.gypi', 515 'gpu_ipc.gypi',
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 758 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
758 ], 759 ],
759 } 760 }
760 ], 761 ],
761 ], 762 ],
762 }, 763 },
763 ], 764 ],
764 }], 765 }],
765 ], 766 ],
766 } 767 }
OLDNEW
« no previous file with comments | « gpu/config/gpu_util.cc ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698