summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 19:46:41 +0000
committersehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 19:46:41 +0000
commit8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5 (patch)
tree3b10c9c5586b24d2b402fffbd477e37d2ec94bd9 /build
parent0f60411a22f77f49d4782829aa68ed4c19cb5b53 (diff)
downloadchromium_src-8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5.zip
chromium_src-8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5.tar.gz
chromium_src-8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5.tar.bz2
This CL is for Neb. It contains his change 501124, with conflicts merged.
Review URL: http://codereview.chromium.org/547005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp
index b6646b7..5c9a214 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -104,8 +104,8 @@
'../third_party/cld/cld.gyp:*',
'../third_party/gles2_book/gles2_book.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
- # As of now Skia build has problems with Linux and/or 64 bits.
- # TODO(sehr,brettw): Make this unconditional.
+ # As of now, build machines do not have GL headers to compile this
+ # TODO(sehr,brettw, neb): Make this unconditional.
'../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*',
],
}, {