| 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 """Common steps for recipes that sync/build Android sources.""" | 5 """Common steps for recipes that sync/build Android sources.""" |
| 6 | 6 |
| 7 from slave import recipe_api | 7 from slave import recipe_api |
| 8 | 8 |
| 9 class AOSPApi(recipe_api.RecipeApi): | 9 class AOSPApi(recipe_api.RecipeApi): |
| 10 def __init__(self, **kwargs): | 10 def __init__(self, **kwargs): |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 yield self.m.path.makedirs('android source root', self.build_path) | 94 yield self.m.path.makedirs('android source root', self.build_path) |
| 95 yield self.m.step('repo init', [ | 95 yield self.m.step('repo init', [ |
| 96 self._repo_path, | 96 self._repo_path, |
| 97 'init', | 97 'init', |
| 98 '-u', self.c.repo.url, | 98 '-u', self.c.repo.url, |
| 99 '-b', self.c.repo.branch], | 99 '-b', self.c.repo.branch], |
| 100 cwd=self.build_path) | 100 cwd=self.build_path) |
| 101 self.m.path.mock_add_paths(repo_in_android_path) | 101 self.m.path.mock_add_paths(repo_in_android_path) |
| 102 | 102 |
| 103 def generate_local_manifest_step(self): | 103 def generate_local_manifest_step(self): |
| 104 local_manifest_ndk_pin_revision = [] | |
| 105 if self.c.ndk_pin_revision: | |
| 106 local_manifest_ndk_pin_revision = ['--ndk-revision', | |
| 107 self.c.ndk_pin_revision] | |
| 108 yield self.m.step( | 104 yield self.m.step( |
| 109 'generate local manifest', [ | 105 'generate local manifest', [ |
| 110 self.m.path.checkout('android_webview', 'buildbot', | 106 self.m.path.checkout('android_webview', 'buildbot', |
| 111 'generate_local_manifest.py'), | 107 'generate_local_manifest.py'), |
| 112 self.build_path, | 108 self.build_path, |
| 113 self._CHROMIUM_IN_ANDROID_SUBPATH] + | 109 self._CHROMIUM_IN_ANDROID_SUBPATH]) |
| 114 local_manifest_ndk_pin_revision) | |
| 115 | |
| 116 | 110 |
| 117 def repo_sync_steps(self): | 111 def repo_sync_steps(self): |
| 118 # repo_init_steps must have been invoked first. | 112 # repo_init_steps must have been invoked first. |
| 119 yield self.m.step('repo sync', | 113 yield self.m.step('repo sync', |
| 120 [self._repo_path, 'sync'] + self.c.repo.sync_flags, | 114 [self._repo_path, 'sync'] + self.c.repo.sync_flags, |
| 121 cwd=self.build_path) | 115 cwd=self.build_path) |
| 122 | 116 |
| 123 def symlink_chromium_into_android_tree_step(self): | 117 def symlink_chromium_into_android_tree_step(self): |
| 124 if self.m.path.exists(self.slave_chromium_in_android_path): | 118 if self.m.path.exists(self.slave_chromium_in_android_path): |
| 125 yield self.m.step('remove chromium_org', | 119 yield self.m.step('remove chromium_org', |
| (...skipping 27 matching lines...) Expand all Loading... |
| 153 envsetup + | 147 envsetup + |
| 154 compile_script + | 148 compile_script + |
| 155 targets + | 149 targets + |
| 156 ['--build-dir', self.m.path.slave_build()] + | 150 ['--build-dir', self.m.path.slave_build()] + |
| 157 ['--src-dir', src_dir] + | 151 ['--src-dir', src_dir] + |
| 158 ['--build-tool', build_tool] + | 152 ['--build-tool', build_tool] + |
| 159 ['--verbose'] + | 153 ['--verbose'] + |
| 160 compiler_option, | 154 compiler_option, |
| 161 cwd=self.m.path.slave_build()) | 155 cwd=self.m.path.slave_build()) |
| 162 | 156 |
| OLD | NEW |