diff options
| author | jiangj <jiangj@opera.com> | 2015-04-16 11:24:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-16 18:24:58 +0000 |
| commit | ae8297db22a6ca96652d42bd0cdc3deff17aba4a (patch) | |
| tree | f86298c6518f0bc4119a8bc93b5098515c8b1559 /ui/accelerated_widget_mac | |
| parent | 85ac931d6d6d8bb53a0e5e02a48be6de6256853b (diff) | |
| download | chromium_src-ae8297db22a6ca96652d42bd0cdc3deff17aba4a.zip chromium_src-ae8297db22a6ca96652d42bd0cdc3deff17aba4a.tar.gz chromium_src-ae8297db22a6ca96652d42bd0cdc3deff17aba4a.tar.bz2 | |
Fix errors found in Mac gn component builds
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.
Review URL: https://codereview.chromium.org/1087873003
Cr-Commit-Position: refs/heads/master@{#325479}
Diffstat (limited to 'ui/accelerated_widget_mac')
| -rw-r--r-- | ui/accelerated_widget_mac/BUILD.gn | 8 | ||||
| -rw-r--r-- | ui/accelerated_widget_mac/accelerated_widget_mac.gyp | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ui/accelerated_widget_mac/BUILD.gn b/ui/accelerated_widget_mac/BUILD.gn index edb8da5..e95ef54 100644 --- a/ui/accelerated_widget_mac/BUILD.gn +++ b/ui/accelerated_widget_mac/BUILD.gn @@ -27,9 +27,15 @@ component("accelerated_widget_mac") { "//skia", "//ui/base", "//ui/events", + "//ui/events:events_base", "//ui/gfx/geometry", "//ui/gl", ] - libs = [ "QuartzCore.framework" ] + libs = [ + # Required by io_surface_texture.mm. + "IOSurface.framework", + "OpenGL.framework", + "QuartzCore.framework", + ] } diff --git a/ui/accelerated_widget_mac/accelerated_widget_mac.gyp b/ui/accelerated_widget_mac/accelerated_widget_mac.gyp index 66fd48c..f149d7c 100644 --- a/ui/accelerated_widget_mac/accelerated_widget_mac.gyp +++ b/ui/accelerated_widget_mac/accelerated_widget_mac.gyp @@ -39,6 +39,9 @@ ], 'link_settings': { 'libraries': [ + # Required by io_surface_texture.mm. + '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', ], }, |