| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import contextlib | 5 import contextlib |
| 6 import datetime | 6 import datetime |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import sys | 10 import sys |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 infra_step=True, | 95 infra_step=True, |
| 96 **kwargs | 96 **kwargs |
| 97 ) | 97 ) |
| 98 | 98 |
| 99 def init_and_sync(self, gclient_config='android_bare', | 99 def init_and_sync(self, gclient_config='android_bare', |
| 100 with_branch_heads=False, use_bot_update=True, | 100 with_branch_heads=False, use_bot_update=True, |
| 101 use_git_cache=True): | 101 use_git_cache=True): |
| 102 # TODO(sivachandra): Move the setting of the gclient spec below to an | 102 # TODO(sivachandra): Move the setting of the gclient spec below to an |
| 103 # internal config extension when they are supported by the recipe system. | 103 # internal config extension when they are supported by the recipe system. |
| 104 if use_git_cache: | 104 if use_git_cache: |
| 105 spec = self.m.gclient.make_config(gclient_config) | 105 spec = self.m.gclient.make_config(gclient_config, GIT_MODE=True) |
| 106 else: | 106 else: |
| 107 spec = self.m.gclient.make_config(gclient_config, CACHE_DIR=None) | 107 spec = self.m.gclient.make_config(gclient_config, |
| 108 CACHE_DIR=None, GIT_MODE=True) |
| 108 spec.target_os = ['android'] | 109 spec.target_os = ['android'] |
| 109 s = spec.solutions[0] | 110 s = spec.solutions[0] |
| 110 s.name = self.c.deps_dir | 111 s.name = self.c.deps_dir |
| 111 s.url = self.c.REPO_URL | 112 s.url = self.c.REPO_URL |
| 112 s.deps_file = self.c.deps_file | 113 s.deps_file = self.c.deps_file |
| 113 s.custom_vars = self.c.gclient_custom_vars or {} | 114 s.custom_vars = self.c.gclient_custom_vars or {} |
| 114 s.managed = self.c.managed | 115 s.managed = self.c.managed |
| 115 s.revision = self.c.revision | 116 s.revision = self.c.revision |
| 116 spec.revisions = self.c.revisions | 117 spec.revisions = self.c.revisions |
| 117 | 118 |
| (...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1480 script = self.c.test_runner | 1481 script = self.c.test_runner |
| 1481 if wrapper_script_suite_name: | 1482 if wrapper_script_suite_name: |
| 1482 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1483 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1483 wrapper_script_suite_name) | 1484 wrapper_script_suite_name) |
| 1484 else: | 1485 else: |
| 1485 env = kwargs.get('env', {}) | 1486 env = kwargs.get('env', {}) |
| 1486 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1487 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1487 self.m.chromium.output_dir) | 1488 self.m.chromium.output_dir) |
| 1488 kwargs['env'] = env | 1489 kwargs['env'] = env |
| 1489 return self.m.python(step_name, script, args, **kwargs) | 1490 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |