Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: build/gyp_chromium

Issue 466133003: Adds chromecast/tools/build to gyp_chromium paths for pymod_do_main. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This script is wrapper for Chromium that adds some support for how GYP 7 # This script is wrapper for Chromium that adds some support for how GYP
8 # is invoked by Chromium beyond what can be done in the gclient hooks. 8 # is invoked by Chromium beyond what can be done in the gclient hooks.
9 9
10 import glob 10 import glob
(...skipping 13 matching lines...) Expand all
24 import gyp 24 import gyp
25 25
26 # Assume this file is in a one-level-deep subdirectory of the source root. 26 # Assume this file is in a one-level-deep subdirectory of the source root.
27 SRC_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 27 SRC_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
28 28
29 # Add paths so that pymod_do_main(...) can import files. 29 # Add paths so that pymod_do_main(...) can import files.
30 sys.path.insert(1, os.path.join(chrome_src, 'tools')) 30 sys.path.insert(1, os.path.join(chrome_src, 'tools'))
31 sys.path.insert(1, os.path.join(chrome_src, 'tools', 'generate_shim_headers')) 31 sys.path.insert(1, os.path.join(chrome_src, 'tools', 'generate_shim_headers'))
32 sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit')) 32 sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
33 sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build')) 33 sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))
34 sys.path.insert(1, os.path.join(chrome_src, 'chromecast', 'tools', 'build'))
34 sys.path.insert(1, os.path.join(chrome_src, 'native_client', 'build')) 35 sys.path.insert(1, os.path.join(chrome_src, 'native_client', 'build'))
35 sys.path.insert(1, os.path.join(chrome_src, 'native_client_sdk', 'src', 36 sys.path.insert(1, os.path.join(chrome_src, 'native_client_sdk', 'src',
36 'build_tools')) 37 'build_tools'))
37 sys.path.insert(1, os.path.join(chrome_src, 'remoting', 'tools', 'build')) 38 sys.path.insert(1, os.path.join(chrome_src, 'remoting', 'tools', 'build'))
38 sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'liblouis')) 39 sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'liblouis'))
39 sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', 40 sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
40 'Source', 'build', 'scripts')) 41 'Source', 'build', 'scripts'))
41 42
42 # On Windows, Psyco shortens warm runs of build/gyp_chromium by about 43 # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
43 # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 44 # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 subprocess.check_call( 332 subprocess.check_call(
332 [sys.executable, os.path.join(script_dir, 'landmines.py')]) 333 [sys.executable, os.path.join(script_dir, 'landmines.py')])
333 334
334 if vs2013_runtime_dll_dirs: 335 if vs2013_runtime_dll_dirs:
335 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs 336 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
336 vs_toolchain.CopyVsRuntimeDlls( 337 vs_toolchain.CopyVsRuntimeDlls(
337 os.path.join(chrome_src, GetOutputDirectory()), 338 os.path.join(chrome_src, GetOutputDirectory()),
338 (x86_runtime, x64_runtime)) 339 (x86_runtime, x64_runtime))
339 340
340 sys.exit(gyp_rc) 341 sys.exit(gyp_rc)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698