From 038afadd1b2732e084981a55557e738c95b039d9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 3 Apr 2015 09:56:03 +0800
Subject: [PATCH] mac: Link with all necessary system libraries

---
 brightray/brightray.gyp  | 32 ++++++++++++++++++++++++++++++++
 brightray/brightray.gypi | 15 ++++++++++-----
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 9c5bbbfcffb3..92b9b9998c64 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -119,6 +119,38 @@
             ],
           },
         }],
+        ['OS=="mac" and libchromiumcontent_component==0', {
+          'link_settings': {
+            'libraries': [
+              # ui_base.gypi:
+              '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
+              # net.gypi:
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+              '$(SDKROOT)/System/Library/Frameworks/Security.framework',
+              '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
+              '$(SDKROOT)/usr/lib/libresolv.dylib',
+              # media.gyp:
+              '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
+              '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
+              '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+              '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
+              # surface.gyp:
+              '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
+              # content_common.gypi:
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+              # base.gyp:
+              '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
+              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+              '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
+              # content_browser.gypi:
+              '$(SDKROOT)/usr/lib/libbsm.dylib',
+            ],
+          },
+        }],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index 6ce2a25e13d2..ed3328c68056 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -73,12 +73,8 @@
       'Common_Base': {
         'abstract': 1,
         'defines': [
-          'COMPONENT_BUILD',
-          'GURL_DLL',
-          'SKIA_DLL',
+          # We are using Release version libchromiumcontent:
           'NDEBUG',
-          'USING_V8_SHARED',
-          'WEBKIT_DLL',
           # From skia_for_chromium_defines.gypi:
           'SK_SUPPORT_LEGACY_GETTOPDEVICE',
           'SK_SUPPORT_LEGACY_BITMAP_CONFIG',
@@ -239,6 +235,15 @@
     ],
   },
   'conditions': [
+    ['libchromiumcontent_component', {
+      'defines': [
+        'COMPONENT_BUILD',
+        'GURL_DLL',
+        'SKIA_DLL',
+        'USING_V8_SHARED',
+        'WEBKIT_DLL',
+      ],
+    }],
     ['OS=="linux" and linux_clang==1', {
       'make_global_settings': [
         ['CC', '/usr/bin/clang'],