summaryrefslogtreecommitdiffstats
path: root/gpu/gles2_conform_support
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 05:39:17 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 05:39:17 +0000
commit96fba197b33d6d831f5cfd2469202db4b6506557 (patch)
tree84987c766b9437b61de2df51e4f3314d525aceaa /gpu/gles2_conform_support
parente6aa46992d11da1581f65c47e4f4c9bf81a27036 (diff)
downloadchromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.zip
chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.gz
chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.bz2
Revert r118240 - gles_2_c_lib as a component.
Broke compile on windows. TBR=gman@chromium.org BUG=107735 TEST=waterfall greens up again Review URL: https://chromiumcodereview.appspot.com/9264003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support')
-rw-r--r--gpu/gles2_conform_support/gles2_conform_support.gyp3
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
index 2341657..c9881d7 100644
--- a/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ b/gpu/gles2_conform_support/gles2_conform_support.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -31,7 +31,6 @@
'type': 'static_library',
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
'<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
],
'include_dirs': ['<(DEPTH)/third_party/khronos'],