From d9056135d7f914fc90b0d3413122a01df3693d46 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 3 Apr 2015 11:37:27 +0800 Subject: [PATCH] Link with libboringssl.dylib --- brightray/brightray.gyp | 3 +++ brightray/brightray.gypi | 2 -- brightray/vendor/libchromiumcontent | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 92b9b9998c64..01ba60a64830 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -122,6 +122,9 @@ ['OS=="mac" and libchromiumcontent_component==0', { 'link_settings': { 'libraries': [ + # This library is built as shared library to avoid symbols + # conflict with Node. + '<(libchromiumcontent_dir)/libboringssl.dylib', # ui_base.gypi: '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', # net.gypi: diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi index ed3328c68056..ac77770221a6 100644 --- a/brightray/brightray.gypi +++ b/brightray/brightray.gypi @@ -10,11 +10,9 @@ ['libchromiumcontent_component', { 'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/shared_library', 'libchromiumcontent_libraries%': '<(libchromiumcontent_shared_libraries)', - 'libchromiumcontent_shared_libraries': [], }, { 'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/static_library', 'libchromiumcontent_libraries%': '<(libchromiumcontent_static_libraries)', - 'libchromiumcontent_static_libraries': [], }], ], diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index cbc562c7a9c6..846a13ae2234 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit cbc562c7a9c6a2a56f3a6ba08652f5e475898d48 +Subproject commit 846a13ae2234490d78568a68f07f5be95c24c0c3