| 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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 gn_vars_dict = GetGypVarsForGN(supplemental_includes) | 543 gn_vars_dict = GetGypVarsForGN(supplemental_includes) |
| 544 | 544 |
| 545 # Automatically turn on crosscompile support for platforms that need it. | 545 # Automatically turn on crosscompile support for platforms that need it. |
| 546 # (The Chrome OS build sets CC_host / CC_target which implicitly enables | 546 # (The Chrome OS build sets CC_host / CC_target which implicitly enables |
| 547 # this mode.) | 547 # this mode.) |
| 548 if all(('ninja' in os.environ.get('GYP_GENERATORS', ''), | 548 if all(('ninja' in os.environ.get('GYP_GENERATORS', ''), |
| 549 gn_vars_dict.get('OS') in ['android', 'ios'], | 549 gn_vars_dict.get('OS') in ['android', 'ios'], |
| 550 'GYP_CROSSCOMPILE' not in os.environ)): | 550 'GYP_CROSSCOMPILE' not in os.environ)): |
| 551 os.environ['GYP_CROSSCOMPILE'] = '1' | 551 os.environ['GYP_CROSSCOMPILE'] = '1' |
| 552 | 552 |
| 553 if not RunGN(gn_vars_dict): | 553 # TODO(brettw) bug 350974 either turn back on GN or delete all of this code. |
| 554 sys.exit(1) | 554 #if not RunGN(gn_vars_dict): |
| 555 # sys.exit(1) |
| 555 args.extend( | 556 args.extend( |
| 556 ['-I' + i for i in additional_include_files(supplemental_includes, args)]) | 557 ['-I' + i for i in additional_include_files(supplemental_includes, args)]) |
| 557 | 558 |
| 558 args.extend(['-D', 'gyp_output_dir=' + GetOutputDirectory()]) | 559 args.extend(['-D', 'gyp_output_dir=' + GetOutputDirectory()]) |
| 559 | 560 |
| 560 print 'Updating projects from gyp files...' | 561 print 'Updating projects from gyp files...' |
| 561 sys.stdout.flush() | 562 sys.stdout.flush() |
| 562 | 563 |
| 563 # Off we go... | 564 # Off we go... |
| 564 gyp_rc = gyp.main(args) | 565 gyp_rc = gyp.main(args) |
| 565 | 566 |
| 566 # Check for landmines (reasons to clobber the build). This must be run here, | 567 # Check for landmines (reasons to clobber the build). This must be run here, |
| 567 # rather than a separate runhooks step so that any environment modifications | 568 # rather than a separate runhooks step so that any environment modifications |
| 568 # from above are picked up. | 569 # from above are picked up. |
| 569 print 'Running build/landmines.py...' | 570 print 'Running build/landmines.py...' |
| 570 subprocess.check_call( | 571 subprocess.check_call( |
| 571 [sys.executable, os.path.join(script_dir, 'landmines.py')]) | 572 [sys.executable, os.path.join(script_dir, 'landmines.py')]) |
| 572 | 573 |
| 573 if vs2013_runtime_dll_dirs: | 574 if vs2013_runtime_dll_dirs: |
| 574 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs | 575 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs |
| 575 CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()), | 576 CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()), |
| 576 (x86_runtime, x64_runtime)) | 577 (x86_runtime, x64_runtime)) |
| 577 | 578 |
| 578 sys.exit(gyp_rc) | 579 sys.exit(gyp_rc) |
| OLD | NEW |