OLD | NEW |
1 #!/bin/bash | 1 #!/bin/bash |
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 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 # Bash functions used by buildbot annotator scripts for the android | 6 # Bash functions used by buildbot annotator scripts for the android |
7 # build of chromium. Executing this script should not perform actions | 7 # build of chromium. Executing this script should not perform actions |
8 # other than setting variables and defining of functions. | 8 # other than setting variables and defining of functions. |
9 | 9 |
10 # Number of jobs on the compile line; e.g. make -j"${JOBS}" | 10 # Number of jobs on the compile line; e.g. make -j"${JOBS}" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 echo "@@@STEP_FAILURE@@@" | 159 echo "@@@STEP_FAILURE@@@" |
160 fi | 160 fi |
161 ) | 161 ) |
162 } | 162 } |
163 | 163 |
164 # Zip and archive a build. | 164 # Zip and archive a build. |
165 function bb_zip_build { | 165 function bb_zip_build { |
166 echo "@@@BUILD_STEP Zip build@@@" | 166 echo "@@@BUILD_STEP Zip build@@@" |
167 python ../../../../scripts/slave/zip_build.py \ | 167 python ../../../../scripts/slave/zip_build.py \ |
168 --src-dir "$SRC_ROOT" \ | 168 --src-dir "$SRC_ROOT" \ |
| 169 --build-dir "out" \ |
169 --exclude-files "lib.target,gen,android_webview,jingle_unittests" \ | 170 --exclude-files "lib.target,gen,android_webview,jingle_unittests" \ |
170 --factory-properties "$FACTORY_PROPERTIES" \ | 171 --factory-properties "$FACTORY_PROPERTIES" \ |
171 --build-properties "$BUILD_PROPERTIES" | 172 --build-properties "$BUILD_PROPERTIES" |
172 } | 173 } |
173 | 174 |
174 # Download and extract a build. | 175 # Download and extract a build. |
175 function bb_extract_build { | 176 function bb_extract_build { |
176 echo "@@@BUILD_STEP Download and extract build@@@" | 177 echo "@@@BUILD_STEP Download and extract build@@@" |
177 if [[ -z $FACTORY_PROPERTIES || -z $BUILD_PROPERTIES ]]; then | 178 if [[ -z $FACTORY_PROPERTIES || -z $BUILD_PROPERTIES ]]; then |
178 return 1 | 179 return 1 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 ) | 220 ) |
220 } | 221 } |
221 | 222 |
222 # Retrieve a packed json property using python | 223 # Retrieve a packed json property using python |
223 function bb_get_json_prop { | 224 function bb_get_json_prop { |
224 local JSON="$1" | 225 local JSON="$1" |
225 local PROP="$2" | 226 local PROP="$2" |
226 | 227 |
227 python -c "import json; print json.loads('$JSON').get('$PROP', '')" | 228 python -c "import json; print json.loads('$JSON').get('$PROP', '')" |
228 } | 229 } |
OLD | NEW |