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

Side by Side Diff: content/content_common.gypi

Issue 25666014: Remove the ENABLE_GPU #define and enable_gpu gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | « content/common/gpu/gpu_memory_manager_client.cc ('k') | content/content_renderer.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 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 ['include', '^common/media/media_stream_options\\.cc$'], 397 ['include', '^common/media/media_stream_options\\.cc$'],
398 ['include', '^common/net/url_fetcher\\.cc$'], 398 ['include', '^common/net/url_fetcher\\.cc$'],
399 ['include', '^common/net/url_request_user_data\\.cc$'], 399 ['include', '^common/net/url_request_user_data\\.cc$'],
400 ['include', '^common/page_state_serialization\\.cc$'], 400 ['include', '^common/page_state_serialization\\.cc$'],
401 ['include', '^common/savable_url_schemes\\.cc$'], 401 ['include', '^common/savable_url_schemes\\.cc$'],
402 ['include', '^common/url_schemes\\.cc$'], 402 ['include', '^common/url_schemes\\.cc$'],
403 ], 403 ],
404 }, { # OS!="ios" 404 }, { # OS!="ios"
405 'dependencies': [ 405 'dependencies': [
406 '../cc/cc.gyp:cc', 406 '../cc/cc.gyp:cc',
407 '../gpu/gpu.gyp:command_buffer_service',
407 '../gpu/gpu.gyp:gles2_c_lib', 408 '../gpu/gpu.gyp:gles2_c_lib',
408 '../gpu/gpu.gyp:gles2_implementation', 409 '../gpu/gpu.gyp:gles2_implementation',
409 '../gpu/gpu.gyp:gpu_ipc', 410 '../gpu/gpu.gyp:gpu_ipc',
410 '../ipc/ipc.gyp:ipc', 411 '../ipc/ipc.gyp:ipc',
411 '../media/media.gyp:media', 412 '../media/media.gyp:media',
412 '../media/media.gyp:shared_memory_support', 413 '../media/media.gyp:shared_memory_support',
413 '../ui/gl/gl.gyp:gl', 414 '../ui/gl/gl.gyp:gl',
414 '../webkit/common/webkit_common.gyp:webkit_common', 415 '../webkit/common/webkit_common.gyp:webkit_common',
415 '../webkit/storage_browser.gyp:webkit_storage_browser', 416 '../webkit/storage_browser.gyp:webkit_storage_browser',
416 '../webkit/storage_common.gyp:webkit_storage_common', 417 '../webkit/storage_common.gyp:webkit_storage_common',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 '../ppapi/ppapi_internal.gyp:ppapi_shared', 478 '../ppapi/ppapi_internal.gyp:ppapi_shared',
478 ], 479 ],
479 }, { # enable_plugins == 0 480 }, { # enable_plugins == 0
480 'sources!': [ 481 'sources!': [
481 'common/font_list.cc', 482 'common/font_list.cc',
482 'common/pepper_plugin_list.cc', 483 'common/pepper_plugin_list.cc',
483 'common/pepper_plugin_list.h', 484 'common/pepper_plugin_list.h',
484 'common/sandbox_util.cc', 485 'common/sandbox_util.cc',
485 ], 486 ],
486 }], 487 }],
487 ['enable_gpu==1', {
488 'dependencies': [
489 '../gpu/gpu.gyp:command_buffer_service',
490 ],
491 }],
492 ['OS=="android"', { 488 ['OS=="android"', {
493 'dependencies': [ 489 'dependencies': [
494 '../media/media.gyp:media', 490 '../media/media.gyp:media',
495 ], 491 ],
496 'sources': [ 492 'sources': [
497 'common/gpu/media/android_video_decode_accelerator.cc', 493 'common/gpu/media/android_video_decode_accelerator.cc',
498 'common/gpu/media/android_video_decode_accelerator.h', 494 'common/gpu/media/android_video_decode_accelerator.h',
499 ], 495 ],
500 }], 496 }],
501 ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', { 497 ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 583 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
588 '<(output)', 584 '<(output)',
589 '<(PRODUCT_DIR)', 585 '<(PRODUCT_DIR)',
590 ], 586 ],
591 'msvs_cygwin_shell': 1, 587 'msvs_cygwin_shell': 1,
592 }, 588 },
593 ] 589 ]
594 }], 590 }],
595 ], 591 ],
596 } 592 }
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_memory_manager_client.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698