Update libcc paths to be in root vendor

script/build-libchromiumcontent.py

@@ -22,8 +22,8 @@ def main():
   # ./script/update -t x64 --defines=''
   # ./script/build --no_shared_library -t x64
   # ./script/create-dist -c static_library -t x64 --no_zip
-  script_dir = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
-                            'libchromiumcontent', 'script')
+  script_dir = os.path.join(SOURCE_ROOT, 'vendor', 'libchromiumcontent',
+                            'script')
   bootstrap = os.path.join(script_dir, 'bootstrap')
   update = os.path.join(script_dir, 'update')
   build = os.path.join(script_dir, 'build')

script/create-dist.py

@@ -20,8 +20,8 @@ ELECTRON_VERSION = get_electron_version()
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
 OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
-CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
-                            'download', 'libchromiumcontent', 'static_library')
+CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'download',
+                            'libchromiumcontent', 'static_library')
 
 PROJECT_NAME = electron_gyp()['project_name%']
 PRODUCT_NAME = electron_gyp()['product_name%']

script/create-node-headers.py

@@ -74,8 +74,8 @@ def copy_headers(dist_headers_dir):
                      dist_headers_dir)
 
   # Copy V8 headers from chromium's repository.
-  src = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download',
-                    'libchromiumcontent', 'src')
+  src = os.path.join(SOURCE_ROOT, 'vendor', 'download', 'libchromiumcontent',
+                     'src')
   for dirpath, _, filenames in os.walk(os.path.join(src, 'v8')):
     for filename in filenames:
       extension = os.path.splitext(filename)[1]

script/dump-symbols.py

@@ -10,8 +10,8 @@ from lib.util import electron_gyp, execute, rm_rf
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
 OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
-CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
-                            'download', 'libchromiumcontent', 'static_library')
+CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'download',
+                            'libchromiumcontent', 'static_library')
 
 
 def main(destination):

script/verify-ffmpeg.py

@@ -9,8 +9,8 @@ from lib.util import electron_gyp, rm_rf
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-FFMPEG_LIBCC_PATH = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
-                                 'download', 'libchromiumcontent', 'ffmpeg')
+FFMPEG_LIBCC_PATH = os.path.join(SOURCE_ROOT, 'vendor', 'download',
+                                 'libchromiumcontent', 'ffmpeg')
 
 PROJECT_NAME = electron_gyp()['project_name%']
 PRODUCT_NAME = electron_gyp()['product_name%']