diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 05:59:31 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 05:59:31 +0000 |
| commit | a24b835e310751658a051b41e9ec48034e93dd02 (patch) | |
| tree | 53996b622af66b2d6686f66c024e9185ecc1a6e6 /content/content_common.gypi | |
| parent | 6cc7bae94e5042f9aca6e346cdf6dc3edd163bd1 (diff) | |
| download | chromium_src-a24b835e310751658a051b41e9ec48034e93dd02.zip chromium_src-a24b835e310751658a051b41e9ec48034e93dd02.tar.gz chromium_src-a24b835e310751658a051b41e9ec48034e93dd02.tar.bz2 | |
Remove the ENABLE_GPU #define and enable_gpu gyp variable
It doesn't make any sense to configure chromium without a gpu and (unsurprisingly)
trying to set this variable to false just results in a broken build.
R=piman
Review URL: https://codereview.chromium.org/25666014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
| -rw-r--r-- | content/content_common.gypi | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index 5412334..36beb54 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', |