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

Side by Side Diff: chrome/chrome.gyp

Issue 6614030: Revert 76840 - Removed GPU plugin.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 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
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/chrome_common.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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 'plugin/webplugin_proxy.h', 594 'plugin/webplugin_proxy.h',
595 ], 595 ],
596 # These are layered in conditionals in the event other platforms 596 # These are layered in conditionals in the event other platforms
597 # end up using this module as well. 597 # end up using this module as well.
598 'conditions': [ 598 'conditions': [
599 ['OS=="win"', { 599 ['OS=="win"', {
600 'include_dirs': [ 600 'include_dirs': [
601 '<(DEPTH)/third_party/wtl/include', 601 '<(DEPTH)/third_party/wtl/include',
602 ], 602 ],
603 }], 603 }],
604 ['enable_gpu==1', {
605 'dependencies': [
606 '../gpu/gpu.gyp:command_buffer_service',
607 ],
608 'sources': [
609 'plugin/command_buffer_stub.cc',
610 'plugin/command_buffer_stub.h',
611 'plugin/command_buffer_stub_win.cc',
612 ],
613 },],
604 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 614 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
605 'dependencies': [ 615 'dependencies': [
606 '../build/linux/system.gyp:gtk', 616 '../build/linux/system.gyp:gtk',
607 ], 617 ],
608 }], 618 }],
609 ], 619 ],
610 }, 620 },
611 { 621 {
612 'target_name': 'utility', 622 'target_name': 'utility',
613 'type': '<(library)', 623 'type': '<(library)',
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
1916 }], # targets 1926 }], # targets
1917 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1927 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1918 ], # 'conditions' 1928 ], # 'conditions'
1919 } 1929 }
1920 1930
1921 # Local Variables: 1931 # Local Variables:
1922 # tab-width:2 1932 # tab-width:2
1923 # indent-tabs-mode:nil 1933 # indent-tabs-mode:nil
1924 # End: 1934 # End:
1925 # vim: set expandtab tabstop=2 shiftwidth=2: 1935 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698