diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 6da645c54718..2ce86b93ad2e 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -93,6 +93,11 @@
         'common/main_delegate_mac.mm',
       ],
       'conditions': [
+        ['libchromiumcontent_component_build', {
+          'link_settings': {
+            'libraries': [ '<@(libchromiumcontent_shared_libraries)' ]
+          },
+        }],
         ['OS=="linux"', {
           'cflags_cc': [
             '-Wno-deprecated-register',
@@ -103,7 +108,6 @@
               '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
             ],
             'libraries': [
-              '<@(libchromiumcontent_shared_libraries)',
               '<(libchromiumcontent_library_dir)/libchromiumviews.a',
               '-lpthread',
               '<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
@@ -113,7 +117,6 @@
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
-              '<@(libchromiumcontent_shared_libraries)',
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
@@ -121,7 +124,6 @@
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
-              '<@(libchromiumcontent_shared_libraries)',
               '<(libchromiumcontent_library_dir)/base_static.lib',
               '<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
               '<(libchromiumcontent_library_dir)/chromiumviews.lib',
diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index bfea5a020275..aafa8309b848 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -11,6 +11,9 @@
     'mac_deployment_target%': '10.8',
     'mac_sdkroot%': 'macosx',
 
+    # Component build.
+    'libchromiumcontent_component_build%': 1,
+
     # Build with clang under Linux.
     'linux_clang%': 1,
 
@@ -110,6 +113,9 @@
         'inherit_from': [
           'Common_Base',
         ],
+        'variables': {
+          'libchromiumcontent_component_build': 1,
+        },
         'msvs_settings': {
           'VCCLCompilerTool': {
             'Optimization': '<(win_debug_Optimization)',
@@ -153,6 +159,9 @@
         'inherit_from': [
           'Common_Base',
         ],
+        'variables': {
+          'libchromiumcontent_component_build': 0,
+        },
         'msvs_settings': {
           'VCCLCompilerTool': {
             'Optimization': '<(win_release_Optimization)',
diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent
index e19d6d778ff3..6b2945f386b1 160000
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit e19d6d778ff3c574906b832102783cb80f5a43c1
+Subproject commit 6b2945f386b1dae68b2b02ad7fc971f99a2f800b