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

Side by Side Diff: webkit/glue/webkit_glue.gypi

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 | « gpu/gpu.gyp ('k') | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 ], 503 ],
504 }, 504 },
505 }], 505 }],
506 ['enable_gpu!=1', { 506 ['enable_gpu!=1', {
507 'sources!': [ 507 'sources!': [
508 '../plugins/ppapi/ppb_graphics_3d_impl.cc', 508 '../plugins/ppapi/ppb_graphics_3d_impl.cc',
509 '../plugins/ppapi/ppb_graphics_3d_impl.h', 509 '../plugins/ppapi/ppb_graphics_3d_impl.h',
510 '../plugins/ppapi/ppb_open_gl_es_impl.cc', 510 '../plugins/ppapi/ppb_open_gl_es_impl.cc',
511 ], 511 ],
512 }], 512 }],
513 ['enable_gpu==1', {
514 'dependencies': [
515 '<(DEPTH)/gpu/gpu.gyp:gpu_plugin',
516 ],
517 }],
513 ['OS!="win"', { 518 ['OS!="win"', {
514 'sources/': [['exclude', '_win\\.cc$']], 519 'sources/': [['exclude', '_win\\.cc$']],
515 'sources!': [ 520 'sources!': [
516 'webthemeengine_impl_win.cc', 521 'webthemeengine_impl_win.cc',
517 ], 522 ],
518 }, { # else: OS=="win" 523 }, { # else: OS=="win"
519 'sources/': [['exclude', '_posix\\.cc$']], 524 'sources/': [['exclude', '_posix\\.cc$']],
520 'include_dirs': [ 525 'include_dirs': [
521 '<(DEPTH)/third_party/wtl/include', 526 '<(DEPTH)/third_party/wtl/include',
522 ], 527 ],
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 'conditions': [ 583 'conditions': [
579 ['OS=="win"', { 584 ['OS=="win"', {
580 'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'], 585 'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'],
581 }], 586 }],
582 ], 587 ],
583 }, 588 },
584 ], 589 ],
585 }], 590 }],
586 ], 591 ],
587 } 592 }
OLDNEW
« no previous file with comments | « gpu/gpu.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698