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

Side by Side Diff: content/content_common.gypi

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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 | « content/content_browser.gypi ('k') | content/content_ppapi_plugin.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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../media/media.gyp:media', 9 '../media/media.gyp:media',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 ['include', '^common/url_schemes\\.cc$'], 409 ['include', '^common/url_schemes\\.cc$'],
410 ], 410 ],
411 }, { # OS!="ios" 411 }, { # OS!="ios"
412 'dependencies': [ 412 'dependencies': [
413 '../cc/cc.gyp:cc', 413 '../cc/cc.gyp:cc',
414 '../gpu/gpu.gyp:gles2_c_lib', 414 '../gpu/gpu.gyp:gles2_c_lib',
415 '../gpu/gpu.gyp:gles2_implementation', 415 '../gpu/gpu.gyp:gles2_implementation',
416 '../gpu/gpu.gyp:gpu_ipc', 416 '../gpu/gpu.gyp:gpu_ipc',
417 '../ipc/ipc.gyp:ipc', 417 '../ipc/ipc.gyp:ipc',
418 '../media/media.gyp:shared_memory_support', 418 '../media/media.gyp:shared_memory_support',
419 '../ppapi/ppapi_internal.gyp:ppapi_shared',
420 '../third_party/npapi/npapi.gyp:npapi', 419 '../third_party/npapi/npapi.gyp:npapi',
421 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 420 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
422 '../ui/gl/gl.gyp:gl', 421 '../ui/gl/gl.gyp:gl',
423 '../webkit/support/webkit_support.gyp:glue', 422 '../webkit/support/webkit_support.gyp:glue',
424 '../webkit/support/webkit_support.gyp:webkit_base', 423 '../webkit/support/webkit_support.gyp:webkit_base',
425 '../webkit/support/webkit_support.gyp:webkit_storage', 424 '../webkit/support/webkit_support.gyp:webkit_storage',
426 ], 425 ],
427 }], 426 }],
428 ['OS!="win"', { 427 ['OS!="win"', {
429 'sources!': [ 428 'sources!': [
(...skipping 29 matching lines...) Expand all
459 '-lXcomposite', 458 '-lXcomposite',
460 ], 459 ],
461 }, 460 },
462 }], 461 }],
463 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { 462 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
464 'sources': [ 463 'sources': [
465 'common/gpu/x_util.cc', 464 'common/gpu/x_util.cc',
466 'common/gpu/x_util.h', 465 'common/gpu/x_util.h',
467 ], 466 ],
468 }], 467 }],
468 ['enable_plugins==1', {
469 'dependencies': [
470 '../ppapi/ppapi_internal.gyp:ppapi_shared',
471 ],
472 }],
469 ['enable_gpu==1', { 473 ['enable_gpu==1', {
470 'dependencies': [ 474 'dependencies': [
471 '../gpu/gpu.gyp:command_buffer_service', 475 '../gpu/gpu.gyp:command_buffer_service',
472 ], 476 ],
473 }], 477 }],
474 ['target_arch=="arm" and chromeos == 1', { 478 ['target_arch=="arm" and chromeos == 1', {
475 'dependencies': [ 479 'dependencies': [
476 '../media/media.gyp:media', 480 '../media/media.gyp:media',
477 ], 481 ],
478 'sources': [ 482 'sources': [
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 '../build/extract_from_cab.py', 565 '../build/extract_from_cab.py',
562 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 566 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
563 '<(output)', 567 '<(output)',
564 '<(PRODUCT_DIR)', 568 '<(PRODUCT_DIR)',
565 ], 569 ],
566 }, 570 },
567 ] 571 ]
568 }], 572 }],
569 ], 573 ],
570 } 574 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_ppapi_plugin.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698