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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_memory_manager_client.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 5412334c8b30420dc720308d7a01ecf101b0ea1a..36beb540717a8d6df76e61b7dc83c76bcab62961 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -404,6 +404,7 @@
}, { # OS!="ios"
'dependencies': [
'../cc/cc.gyp:cc',
+ '../gpu/gpu.gyp:command_buffer_service',
'../gpu/gpu.gyp:gles2_c_lib',
'../gpu/gpu.gyp:gles2_implementation',
'../gpu/gpu.gyp:gpu_ipc',
@@ -484,11 +485,6 @@
'common/sandbox_util.cc',
],
}],
- ['enable_gpu==1', {
- 'dependencies': [
- '../gpu/gpu.gyp:command_buffer_service',
- ],
- }],
['OS=="android"', {
'dependencies': [
'../media/media.gyp:media',
« 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