diff options
| author | jiangj <jiangj@opera.com> | 2015-04-18 06:29:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-18 13:29:23 +0000 |
| commit | 2bd42fdbfab81b645ac926bd115e2a0762426b64 (patch) | |
| tree | dbeba7e0f690aa4ed0efc41c223e4fa5a892e4b6 /gpu/command_buffer_service.gypi | |
| parent | 611f311a54cdba7a14bc3c15a0f9a17493cfbd1d (diff) | |
| download | chromium_src-2bd42fdbfab81b645ac926bd115e2a0762426b64.zip chromium_src-2bd42fdbfab81b645ac926bd115e2a0762426b64.tar.gz chromium_src-2bd42fdbfab81b645ac926bd115e2a0762426b64.tar.bz2 | |
Reland: Fix errors found in Mac gn component builds
This is relanding https://codereview.chromium.org/1087873003 which was
reverted in https://codereview.chromium.org/1089773003/.
Mac gn component build fail because of missing frameworks and missing some other
dependencies, and occasionally file list out of sync with the gyp counterpart:
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_dbg/builds/321/steps/compile/logs/stdio
For instance, the frameworks linked in the components that sync depends on is not
automatically linked into sync, thus revealing the issue.
BUG=477710
Review URL: https://codereview.chromium.org/1098513002
Cr-Commit-Position: refs/heads/master@{#325771}
Diffstat (limited to 'gpu/command_buffer_service.gypi')
| -rw-r--r-- | gpu/command_buffer_service.gypi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi index 95a0aa2..953ddd2 100644 --- a/gpu/command_buffer_service.gypi +++ b/gpu/command_buffer_service.gypi @@ -142,6 +142,15 @@ '../third_party/khronos', ], }], + ['OS=="mac"', { + # Required by gles2_cmd_decoder.cc on Mac. + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + }, + }], ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { 'sources': [ 'command_buffer/service/async_pixel_transfer_manager_egl.cc', |