Chromium Code Reviews| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 | 61 |
| 62 echo "@@@BUILD_STEP Environment setup@@@" | 62 echo "@@@BUILD_STEP Environment setup@@@" |
| 63 bb_parse_args "$@" | 63 bb_parse_args "$@" |
| 64 | 64 |
| 65 local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool) | 65 local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool) |
| 66 if [[ $BUILDTOOL = ninja ]]; then | 66 if [[ $BUILDTOOL = ninja ]]; then |
| 67 export GYP_GENERATORS=ninja | 67 export GYP_GENERATORS=ninja |
| 68 fi | 68 fi |
| 69 export GOMA_DIR=/b/build/goma | 69 export GOMA_DIR=/b/build/goma |
| 70 . build/android/envsetup.sh | 70 . build/android/envsetup.sh |
| 71 adb kill-server | |
|
Yaron
2012/09/29 01:12:35
This is run for builders too, isn't? Seems only ne
| |
| 71 } | 72 } |
| 72 | 73 |
| 73 function bb_compile_setup { | 74 function bb_compile_setup { |
| 74 local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \ | 75 local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \ |
| 75 extra_gyp_defines)" | 76 extra_gyp_defines)" |
| 76 export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines" | 77 export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines" |
| 77 if echo $extra_gyp_defines | grep -q clang; then | 78 if echo $extra_gyp_defines | grep -q clang; then |
| 78 unset CXX_target | 79 unset CXX_target |
| 79 fi | 80 fi |
| 80 bb_setup_goma_internal | 81 bb_setup_goma_internal |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 298 ) | 299 ) |
| 299 } | 300 } |
| 300 | 301 |
| 301 # Retrieve a packed json property using python | 302 # Retrieve a packed json property using python |
| 302 function bb_get_json_prop { | 303 function bb_get_json_prop { |
| 303 local JSON="$1" | 304 local JSON="$1" |
| 304 local PROP="$2" | 305 local PROP="$2" |
| 305 | 306 |
| 306 python -c "import json; print json.loads('$JSON').get('$PROP', '')" | 307 python -c "import json; print json.loads('$JSON').get('$PROP', '')" |
| 307 } | 308 } |
| OLD | NEW |