| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2013 The Chromium Authors. All rights reserved. | 2 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import os | 6 import os |
| 7 import json | 7 import json |
| 8 import sys | 8 import sys |
| 9 | 9 |
| 10 import bb_utils | 10 import bb_utils |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 def Compile(options): | 64 def Compile(options): |
| 65 if options.run_mb: | 65 if options.run_mb: |
| 66 os.environ['GYP_CHROMIUM_NO_ACTION'] = '1' | 66 os.environ['GYP_CHROMIUM_NO_ACTION'] = '1' |
| 67 RunHooks(options.target) | 67 RunHooks(options.target) |
| 68 GenerateBuildFiles(options) | 68 GenerateBuildFiles(options) |
| 69 else: | 69 else: |
| 70 RunHooks(options.target) | 70 RunHooks(options.target) |
| 71 | 71 |
| 72 cmd = [os.path.join(SLAVE_SCRIPTS_DIR, 'compile.py'), | 72 cmd = [os.path.join(SLAVE_SCRIPTS_DIR, 'compile.py'), |
| 73 '--build-tool=ninja', | |
| 74 '--compiler=goma', | 73 '--compiler=goma', |
| 75 '--target=%s' % options.target, | 74 '--target=%s' % options.target, |
| 76 '--goma-dir=%s' % bb_utils.GOMA_DIR] | 75 '--goma-dir=%s' % bb_utils.GOMA_DIR] |
| 77 bb_annotations.PrintNamedStep('compile') | 76 bb_annotations.PrintNamedStep('compile') |
| 78 if options.build_targets: | 77 if options.build_targets: |
| 79 build_targets = options.build_targets.split(',') | 78 build_targets = options.build_targets.split(',') |
| 80 cmd += ['--build-args', ' '.join(build_targets)] | 79 cmd += ['--build-args', ' '.join(build_targets)] |
| 81 RunCmd(cmd, halt_on_failure=True, cwd=DIR_BUILD_ROOT) | 80 RunCmd(cmd, halt_on_failure=True, cwd=DIR_BUILD_ROOT) |
| 82 | 81 |
| 83 | 82 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 142 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 144 setattr(options, 'extra_src', | 143 setattr(options, 'extra_src', |
| 145 options.factory_properties.get('extra_src', '')) | 144 options.factory_properties.get('extra_src', '')) |
| 146 | 145 |
| 147 if options.steps: | 146 if options.steps: |
| 148 bb_utils.RunSteps(options.steps.split(','), GetHostStepCmds(), options) | 147 bb_utils.RunSteps(options.steps.split(','), GetHostStepCmds(), options) |
| 149 | 148 |
| 150 | 149 |
| 151 if __name__ == '__main__': | 150 if __name__ == '__main__': |
| 152 sys.exit(main(sys.argv)) | 151 sys.exit(main(sys.argv)) |
| OLD | NEW |