From ae8297db22a6ca96652d42bd0cdc3deff17aba4a Mon Sep 17 00:00:00 2001 From: jiangj Date: Thu, 16 Apr 2015 11:24:47 -0700 Subject: 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} --- gpu/command_buffer/service/BUILD.gn | 8 ++++++++ gpu/command_buffer_service.gypi | 9 +++++++++ 2 files changed, 17 insertions(+) (limited to 'gpu') diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn index 8045a03..4d71c71 100644 --- a/gpu/command_buffer/service/BUILD.gn +++ b/gpu/command_buffer/service/BUILD.gn @@ -165,6 +165,14 @@ source_set("service_sources") { ] } + if (is_mac) { + # Required by gles2_cmd_decoder.cc on Mac. + libs = [ + "IOSurface.framework", + "OpenGL.framework", + ] + } + if (is_android && !is_debug) { # On Android optimize more since this component can be a bottleneck. configs -= [ "//build/config/compiler:optimize" ] 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', -- cgit v1.1