mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No longer link with shared library of boringssl

Browse source
This commit is contained in:
Cheng Zhao 2015-04-10 18:49:19 +08:00
parent 10122304ed
commit 48c9f4a0a6
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brightray/brightray.gyp
View file

@ -81,8 +81,6 @@
}, { }, {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
# libboringssl is always linked dynamically.
'<(libchromiumcontent_dir)/libboringssl.so',
# Following libraries are required by libchromiumcontent: # Following libraries are required by libchromiumcontent:
'-lasound', '-lasound',
'-lcap', '-lcap',
@ -109,9 +107,6 @@
['OS=="mac" and libchromiumcontent_component==0', { ['OS=="mac" and libchromiumcontent_component==0', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
# This library is built as shared library to avoid symbols
# conflict with Node.
'<(libchromiumcontent_dir)/libboringssl.dylib',
# ui_base.gypi: # ui_base.gypi:
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
# net.gypi: # net.gypi:
@ -152,7 +147,6 @@
['OS=="win" and libchromiumcontent_component==0', { ['OS=="win" and libchromiumcontent_component==0', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(libchromiumcontent_dir)/boringssl.dll',
'<(libchromiumcontent_dir)/ffmpegsumo.lib', '<(libchromiumcontent_dir)/ffmpegsumo.lib',
'<(libchromiumcontent_dir)/libyuv.lib', '<(libchromiumcontent_dir)/libyuv.lib',
# content_browser.gypi: # content_browser.gypi:

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 44cb29a12cf2b93064ce77a1be94528a535016f4 Subproject commit a325ed7b30bf0680881783edd92ca235b5468e11