diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
| commit | 3c0edf1d82131458b0aa7c5115a53e62a6421f21 (patch) | |
| tree | 1ea30c39763a51a590e0d0abb47080447f18fed1 /gpu/demos/demos.gyp | |
| parent | 6954b285be656e38ed8462c8b296c3a8576193e8 (diff) | |
| download | chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.zip chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.gz chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.bz2 | |
Revert r118525 / Re-land r118240 - the build failure was a flake.
This change re-enables building gles2_c_lib as a component.
TBR=gman@chromium.org
BUG=107735
TEST=waterfall stays green
Review URL: https://chromiumcodereview.appspot.com/9150022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos/demos.gyp')
| -rw-r--r-- | gpu/demos/demos.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 6292564..59800c8c 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. @@ -41,6 +41,7 @@ 'gpu_demo_framework', '../gpu.gyp:command_buffer_client', '../gpu.gyp:command_buffer_service', + '../gpu.gyp:gles2_implementation', '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../ui/ui.gyp:ui', |