diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 01ba60a64830..b8b21787ac96 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -116,15 +116,15 @@
           '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',
             ],
           },
         }],
         ['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:
@@ -154,13 +154,11 @@
             ],
           },
         }],
-        ['OS=="win"', {
+        ['OS=="win" and libchromiumcontent_component', {
           'link_settings': {
             'libraries': [
               '<(libchromiumcontent_dir)/base_static.lib',
-              '<(libchromiumcontent_dir)/chromiumcontent.dll.lib',
-              '<(libchromiumcontent_dir)/chromiumviews.lib',
-              '<(libchromiumcontent_dir)/sandbox_static.lib',
+              '<(libchromiumcontent_dir)/sandbox.lib',
             ],
           },
         }],
diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent
index 1b7aec028cf8..fa70c1a296d9 160000
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit 1b7aec028cf86463bc6c00ce15e294cdd157b5c1
+Subproject commit fa70c1a296d9b8f89a4e42bd3116ac36a831169c