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

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: 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
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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 ['include', '^common/savable_url_schemes\\.cc$'], 407 ['include', '^common/savable_url_schemes\\.cc$'],
408 ['include', '^common/url_schemes\\.cc$'], 408 ['include', '^common/url_schemes\\.cc$'],
409 ], 409 ],
410 }, { # OS!="ios" 410 }, { # OS!="ios"
411 'dependencies': [ 411 'dependencies': [
412 '../cc/cc.gyp:cc', 412 '../cc/cc.gyp:cc',
413 '../gpu/gpu.gyp:gles2_implementation', 413 '../gpu/gpu.gyp:gles2_implementation',
414 '../gpu/gpu.gyp:gpu_ipc', 414 '../gpu/gpu.gyp:gpu_ipc',
415 '../ipc/ipc.gyp:ipc', 415 '../ipc/ipc.gyp:ipc',
416 '../media/media.gyp:shared_memory_support', 416 '../media/media.gyp:shared_memory_support',
417 '../ppapi/ppapi_internal.gyp:ppapi_shared',
418 '../third_party/npapi/npapi.gyp:npapi', 417 '../third_party/npapi/npapi.gyp:npapi',
419 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 418 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
420 '../ui/gl/gl.gyp:gl', 419 '../ui/gl/gl.gyp:gl',
421 '../webkit/support/webkit_support.gyp:glue', 420 '../webkit/support/webkit_support.gyp:glue',
422 '../webkit/support/webkit_support.gyp:webkit_base', 421 '../webkit/support/webkit_support.gyp:webkit_base',
423 '../webkit/support/webkit_support.gyp:webkit_storage', 422 '../webkit/support/webkit_support.gyp:webkit_storage',
424 ], 423 ],
425 }], 424 }],
426 ['OS!="win"', { 425 ['OS!="win"', {
427 'sources!': [ 426 'sources!': [
(...skipping 29 matching lines...) Expand all
457 '-lXcomposite', 456 '-lXcomposite',
458 ], 457 ],
459 }, 458 },
460 }], 459 }],
461 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { 460 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
462 'sources': [ 461 'sources': [
463 'common/gpu/x_util.cc', 462 'common/gpu/x_util.cc',
464 'common/gpu/x_util.h', 463 'common/gpu/x_util.h',
465 ], 464 ],
466 }], 465 }],
466 ['enable_ppapi==1', {
467 'dependencies': [
468 '../ppapi/ppapi_internal.gyp:ppapi_shared',
469 ],
470 }],
467 ['enable_gpu==1', { 471 ['enable_gpu==1', {
468 'dependencies': [ 472 'dependencies': [
469 '../gpu/gpu.gyp:command_buffer_service', 473 '../gpu/gpu.gyp:command_buffer_service',
470 ], 474 ],
471 }], 475 }],
472 ['target_arch=="arm" and chromeos == 1', { 476 ['target_arch=="arm" and chromeos == 1', {
473 'dependencies': [ 477 'dependencies': [
474 '../media/media.gyp:media', 478 '../media/media.gyp:media',
475 ], 479 ],
476 'sources': [ 480 'sources': [
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 '../build/extract_from_cab.py', 563 '../build/extract_from_cab.py',
560 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 564 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
561 '<(output)', 565 '<(output)',
562 '<(PRODUCT_DIR)', 566 '<(PRODUCT_DIR)',
563 ], 567 ],
564 }, 568 },
565 ] 569 ]
566 }], 570 }],
567 ], 571 ],
568 } 572 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698