diff --git a/atom.gyp b/atom.gyp
index 7db7c8169a34..b874b09cf04a 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -13,10 +13,6 @@
     'mac_framework_dirs': [
       '<(atom_source_root)/external_binaries',
     ],
-    'includes': [
-       # Rules for excluding e.g. foo_win.cc from the build on non-Windows.
-      'filename_rules.gypi',
-    ],
   },
   'targets': [
     {
diff --git a/filename_rules.gypi b/filename_rules.gypi
deleted file mode 100644
index e1ee46dddee8..000000000000
--- a/filename_rules.gypi
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This gypi file defines the patterns used for determining whether a
-# file is excluded from the build on a given platform.  It is
-# included by common.gypi for chromium_code.
-
-{
-  'target_conditions': [
-    ['OS!="win"', {
-      'sources/': [ ['exclude', '_win(_unittest)?\\.(h|cc)$'],
-                    ['exclude', '(^|/)win/'],
-                    ['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ],
-    }],
-    ['OS!="mac"', {
-      'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'],
-                    ['exclude', '(^|/)(cocoa|mac)/'] ],
-    }],
-    ['OS!="ios"', {
-      'sources/': [ ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'],
-                    ['exclude', '(^|/)ios/'] ],
-    }],
-    ['OS!="mac" and OS!="ios"', {
-      'sources/': [ ['exclude', '\\.mm?$' ] ],
-    }],
-    # Do not exclude the linux files on *BSD since most of them can be
-    # shared at this point.
-    # In case a file is not needed, it is going to be excluded later on.
-    # TODO(evan): the above is not correct; we shouldn't build _linux
-    # files on non-linux.
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd"', {
-      'sources/': [
-        ['exclude', '(^|/)library_loaders/'],
-        ['exclude', '_linux(_unittest)?\\.(h|cc)$'],
-        ['exclude', '(^|/)linux_[^/]*\\.(h|cc)$'],
-        ['exclude', '(^|/)linux/'],
-        ['exclude', '_x11(_unittest)?\\.(h|cc)$'],
-        ['exclude', '(^|/)x11_[^/]*\\.(h|cc)$'],
-        ['exclude', '(^|/)x11/'],
-      ],
-    }],
-    ['OS!="android"', {
-      'sources/': [
-        ['exclude', '_android(_unittest)?\\.cc$'],
-        ['exclude', '(^|/)android/'],
-      ],
-    }],
-    ['OS=="win"', {
-      'sources/': [
-        ['exclude', '_posix(_unittest)?\\.(h|cc)$'],
-        ['exclude', '(^|/)posix/'],
-      ],
-    }],
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd"', {
-      'sources/': [
-        ['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
-      ],
-    }],
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd"', {
-      'sources/': [
-        ['exclude', '_gtk(_browsertest|_unittest)?\\.(h|cc)$'],
-        ['exclude', '(^|/)gtk/'],
-        ['exclude', '(^|/)gtk_[^/]*\\.(h|cc)$'],
-        ['exclude', '(^|/)libgtk2ui/'],
-        ['exclude', '(^|/)x/'],
-      ],
-    }],
-    ['OS=="mac"', {
-      'sources/': [ ['exclude', '_aura(_browsertest|_unittest)?\\.(h|cc)$'],
-                    ['exclude', '(^|/)aura/'],
-                    ['exclude', '_views\\.(h|cc)$'],
-                    ['exclude', '(^|/)views/'],
-      ],
-    }],
-  ]
-}
diff --git a/vendor/brightray b/vendor/brightray
index 821eed6ada17..80c8211551c3 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 821eed6ada17149eea96bb3ab6cb0c299342f535
+Subproject commit 80c8211551c3fe6a51ff0abfe235bd889d06ffd6