| OLD | NEW |
| 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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 gyp_rc = gyp.main(args) | 493 gyp_rc = gyp.main(args) |
| 494 | 494 |
| 495 # Check for landmines (reasons to clobber the build). This must be run here, | 495 # Check for landmines (reasons to clobber the build). This must be run here, |
| 496 # rather than a separate runhooks step so that any environment modifications | 496 # rather than a separate runhooks step so that any environment modifications |
| 497 # from above are picked up. | 497 # from above are picked up. |
| 498 print 'Running build/landmines.py...' | 498 print 'Running build/landmines.py...' |
| 499 subprocess.check_call( | 499 subprocess.check_call( |
| 500 [sys.executable, os.path.join(script_dir, 'landmines.py')]) | 500 [sys.executable, os.path.join(script_dir, 'landmines.py')]) |
| 501 | 501 |
| 502 if vs2013_runtime_dll_dirs: | 502 if vs2013_runtime_dll_dirs: |
| 503 CopyVsRuntimeDlls(GetOutputDirectory(), vs2013_runtime_dll_dirs) | 503 CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()), |
| 504 vs2013_runtime_dll_dirs) |
| 504 | 505 |
| 505 sys.exit(gyp_rc) | 506 sys.exit(gyp_rc) |
| OLD | NEW |