Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: scripts/slave/recipes/android/android_builder.expected/klp_builder.json

Issue 134193014: Make recipes use the new way of enabling goma. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "[DEPOT_TOOLS]/gclient.py", 6 "[DEPOT_TOOLS]/gclient.py",
7 "config", 7 "config",
8 "--spec", 8 "--spec",
9 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget _os = ['android']" 9 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget _os = ['android']"
10 ], 10 ],
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 "-u", 137 "-u",
138 "[DEPOT_TOOLS]/gclient.py", 138 "[DEPOT_TOOLS]/gclient.py",
139 "runhooks" 139 "runhooks"
140 ], 140 ],
141 "env": { 141 "env": {
142 "ANDROID_SDK_BUILD_TOOLS_VERSION": "android-4.4", 142 "ANDROID_SDK_BUILD_TOOLS_VERSION": "android-4.4",
143 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/src/third_party/android_tools_internal/ sdk", 143 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/src/third_party/android_tools_internal/ sdk",
144 "ANDROID_SDK_VERSION": "4.4", 144 "ANDROID_SDK_VERSION": "4.4",
145 "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD]/src/repo/build/get_internal_landm ines.py", 145 "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD]/src/repo/build/get_internal_landm ines.py",
146 "GYP_CROSSCOMPILE": "1", 146 "GYP_CROSSCOMPILE": "1",
147 "GYP_DEFINES": "OS=android android_sdk_root=[SLAVE_BUILD]/src/third_party/ android_tools_internal/sdk android_sdk_version=4.4 app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=stati c_library fastbuild=1 host_os=linux target_arch=arm", 147 "GYP_DEFINES": "OS=android android_sdk_root=[SLAVE_BUILD]/src/third_party/ android_tools_internal/sdk android_sdk_version=4.4 app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=stati c_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux target_arch=arm use_gom a=1",
148 "GYP_GENERATORS": "ninja", 148 "GYP_GENERATORS": "ninja",
149 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s" 149 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
150 }, 150 },
151 "name": "gclient runhooks" 151 "name": "gclient runhooks"
152 }, 152 },
153 { 153 {
154 "abort_on_failure": true, 154 "abort_on_failure": true,
155 "cmd": [ 155 "cmd": [
156 "python", 156 "python",
157 "-u", 157 "-u",
158 "[BUILD]/scripts/slave/compile.py", 158 "[BUILD]/scripts/slave/compile.py",
159 "--target", 159 "--target",
160 "Debug", 160 "Debug",
161 "--src-dir", 161 "--src-dir",
162 "[SLAVE_BUILD]/src", 162 "[SLAVE_BUILD]/src",
163 "--build-tool", 163 "--build-tool",
164 "ninja", 164 "ninja",
165 "--compiler", 165 "--compiler",
166 "goma", 166 "goma",
167 "--goma-dir",
168 "[BUILD]/goma",
167 "--" 169 "--"
168 ], 170 ],
169 "env": { 171 "env": {
170 "ANDROID_SDK_BUILD_TOOLS_VERSION": "android-4.4", 172 "ANDROID_SDK_BUILD_TOOLS_VERSION": "android-4.4",
171 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/src/third_party/android_tools_internal/ sdk", 173 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/src/third_party/android_tools_internal/ sdk",
172 "ANDROID_SDK_VERSION": "4.4", 174 "ANDROID_SDK_VERSION": "4.4",
173 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s" 175 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
174 }, 176 },
175 "name": "compile" 177 "name": "compile"
176 }, 178 },
(...skipping 21 matching lines...) Expand all
198 { 200 {
199 "always_run": true, 201 "always_run": true,
200 "cmd": [ 202 "cmd": [
201 "rm", 203 "rm",
202 "-rf", 204 "-rf",
203 "[SLAVE_BUILD]/src/out/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8 a00.zip" 205 "[SLAVE_BUILD]/src/out/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8 a00.zip"
204 ], 206 ],
205 "name": "cleanup_build" 207 "name": "cleanup_build"
206 } 208 }
207 ] 209 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698