Cleanup the brightray.gyp file

brightray/brightray.gyp

@@ -44,11 +44,12 @@
               '-Wl,--no-whole-archive',
             ],
           }
-        }, {
+        }, {  # (Release build on Linux)
           'link_settings': {
             'libraries': [ '<@(libchromiumcontent_libraries)' ]
           },
-        }],
+        }],  # (Normal builds)
+        # Linux specific link settings.
         ['OS=="linux"', {
           'link_settings': {
             'ldflags': [
@@ -96,15 +97,16 @@
               },
             }],
           ],
-        }],
+        }],  # OS=="linux"
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
-        }],
+          'conditions':  [
-        ['OS=="mac" and libchromiumcontent_component==0', {
+            # Link with system frameworks.
+            ['libchromiumcontent_component==0', {
               'link_settings': {
                 'libraries': [
                   # ui_base.gypi:
@@ -136,19 +138,24 @@
                 ],
               },
             }],
-        ['OS=="win" and libchromiumcontent_component==1', {
+          ]
+        }],  # OS=="mac"
+        ['OS=="win"', {
+          'conditions': [
+            ['libchromiumcontent_component', {
+              # sandbox and base_static are always linked statically.
               'link_settings': {
                 'libraries': [
                   '<(libchromiumcontent_dir)/base_static.lib',
                   '<(libchromiumcontent_dir)/sandbox.lib',
                 ],
               },
-        }],
+            }, {
-        ['OS=="win" and libchromiumcontent_component==0', {
+              # Link with system libraries.
               'link_settings': {
                 'libraries': [
+                  # ffmpegsumo.lib is required for linking with ffmpegsumo.dll
                   '<(libchromiumcontent_dir)/ffmpegsumo.lib',
-              '<(libchromiumcontent_dir)/libyuv.lib',
                   # content_browser.gypi:
                   '-lsensorsapi.lib',
                   '-lportabledeviceguids.lib',
@@ -188,7 +195,9 @@
                   },
                 },
               },
-        }],
+            }],  # libchromiumcontent_component
+          ],
+        }],  # OS=="win"
       ],
     },
   ],