diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 41db0f50443b..0d0b330abf6e 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -116,9 +116,6 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', - # This library is built as shared library to avoid symbols - # conflict with Node. - '<(libchromiumcontent_dir)/libboringssl.dylib', ], }, }], @@ -154,17 +151,17 @@ ], }, }], - ['OS=="win" and libchromiumcontent_component', { + ['OS=="win" and libchromiumcontent_component==1', { 'link_settings': { 'libraries': [ '<(libchromiumcontent_dir)/base_static.lib', '<(libchromiumcontent_dir)/sandbox.lib', ], }, - }, { + }], + ['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 301d2d617c64..b371f0a7b0c1 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 301d2d617c64ed020bf787d541b9a7d5e10941a8 +Subproject commit b371f0a7b0c1dd47d68f6ea5bade36451a13e7e1