From 48c9f4a0a6a37140251d06af7bc9cd49fc000abc Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 10 Apr 2015 18:49:19 +0800 Subject: [PATCH] No longer link with shared library of boringssl --- brightray/brightray.gyp | 6 ------ brightray/vendor/libchromiumcontent | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 10313d2ff06c..42e087711fd5 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -81,8 +81,6 @@ }, { 'link_settings': { 'libraries': [ - # libboringssl is always linked dynamically. - '<(libchromiumcontent_dir)/libboringssl.so', # Following libraries are required by libchromiumcontent: '-lasound', '-lcap', @@ -109,9 +107,6 @@ ['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: @@ -152,7 +147,6 @@ ['OS=="win" and libchromiumcontent_component==0', { 'link_settings': { 'libraries': [ - '<(libchromiumcontent_dir)/boringssl.dll', '<(libchromiumcontent_dir)/ffmpegsumo.lib', '<(libchromiumcontent_dir)/libyuv.lib', # content_browser.gypi: diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 44cb29a12cf2..a325ed7b30bf 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 44cb29a12cf2b93064ce77a1be94528a535016f4 +Subproject commit a325ed7b30bf0680881783edd92ca235b5468e11