diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 18:08:21 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 18:08:21 +0000 |
| commit | df46b57e362acd0de676eb4c19aa49c9728ccaed (patch) | |
| tree | 606c5f4e65c22b75e2e727f0459200d1e57f5cdc /gpu/gpu.gyp | |
| parent | b4c4e3c61f4c6f07ef5ba6ffe4e3f825ec262091 (diff) | |
| download | chromium_src-df46b57e362acd0de676eb4c19aa49c9728ccaed.zip chromium_src-df46b57e362acd0de676eb4c19aa49c9728ccaed.tar.gz chromium_src-df46b57e362acd0de676eb4c19aa49c9728ccaed.tar.bz2 | |
Revert 260560 "Roll ANGLE with a translator gyp change."
Linux Debug started failing GLHelperTest.ARGBSyncReadbackTest, stack blames:
third_party/angle/src/compiler/translator/PoolAlloc.cpp:38
TPoolAllocator* GetGlobalPoolAllocator():
Assertion `PoolIndex != (static_cast<OS_TLSIndex>(-1))' failed.
> Roll ANGLE with a translator gyp change.
>
> BUG=356760
>
> Review URL: https://codereview.chromium.org/217123002
TBR=jmadill@chromium.org
Review URL: https://codereview.chromium.org/218733007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index c09d703..57b358e 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -130,7 +130,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '<(angle_path)/src/build_angle.gyp:translator', + '<(angle_path)/src/build_angle.gyp:translator_static', ], 'variables': { 'ANGLE_DIR': '<(angle_path)', |