diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 17:01:07 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 17:01:07 +0000 |
| commit | 40fd61bb1456d5a35405dcb5a901131ef5aca2e9 (patch) | |
| tree | 9f3ce7966b7d4e16d282581ee1077c719a3d12f6 /ui | |
| parent | 080f4e7daed8ab3a71bb32ed90c0edfd1845f848 (diff) | |
| download | chromium_src-40fd61bb1456d5a35405dcb5a901131ef5aca2e9.zip chromium_src-40fd61bb1456d5a35405dcb5a901131ef5aca2e9.tar.gz chromium_src-40fd61bb1456d5a35405dcb5a901131ef5aca2e9.tar.bz2 | |
Call the built product of target gl 'gl_wrapper'.
With the components build on mac, libgl.dylib collides with /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib (HFS+ is case-insensitive). libgl_wrapper.dylib on the other hand works fine.
BUG=90078
TEST=mac components build fails a bit later
Review URL: http://codereview.chromium.org/9426019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/gl/gl.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp index 0988378..9132b5e 100644 --- a/ui/gfx/gl/gl.gyp +++ b/ui/gfx/gl/gl.gyp @@ -11,6 +11,7 @@ { 'target_name': 'gl', 'type': '<(component)', + 'product_name': 'gl_wrapper', # Avoid colliding with OS X's libGL.dylib 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |