From 96de22ba5f95192f91627fcafbd3bf6ad52cbd3c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 22 Mar 2017 12:53:55 -0700 Subject: [PATCH] Use cpplint from depot_tools --- brightray/.gitmodules | 3 --- brightray/script/cpplint | 2 +- brightray/vendor/google-styleguide | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 160000 brightray/vendor/google-styleguide diff --git a/brightray/.gitmodules b/brightray/.gitmodules index 719488608b5..54ed18cf53b 100644 --- a/brightray/.gitmodules +++ b/brightray/.gitmodules @@ -4,6 +4,3 @@ [submodule "vendor/gyp"] path = vendor/gyp url = https://github.com/electron/gyp -[submodule "vendor/google-styleguide"] - path = vendor/google-styleguide - url = https://github.com/svn2github/sgss-mirror-google-styleguide diff --git a/brightray/script/cpplint b/brightray/script/cpplint index ff09db9e7d0..f3a871d6e3d 100755 --- a/brightray/script/cpplint +++ b/brightray/script/cpplint @@ -7,7 +7,7 @@ import sys SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) -CPPLINT = os.path.join(SOURCE_ROOT, 'vendor', 'google-styleguide', 'trunk', 'cpplint', 'cpplint.py') +CPPLINT = os.path.join(SOURCE_ROOT, 'vendor', 'libchromiumcontent', 'vendor', 'depot_tools', 'cpplint.py') LINE_LENGTH = 100 IGNORED_FILES = [ diff --git a/brightray/vendor/google-styleguide b/brightray/vendor/google-styleguide deleted file mode 160000 index ba88c8a53f1..00000000000 --- a/brightray/vendor/google-styleguide +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ba88c8a53f1b563c43fc063cc048e5efdc238c18