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

Side by Side Diff: build/android/buildbot/buildbot_functions.sh

Issue 11038029: Add adb start-server on android buildbots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 71 adb kill-server
Yaron 2012/10/04 22:41:46 This is synchronous, right? We don't need to give
Isaac (away) 2012/10/05 19:33:59 We do, but baseline_setup is run a couple minutes
72 adb start-server
72 } 73 }
73 74
74 function bb_compile_setup { 75 function bb_compile_setup {
75 local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \ 76 local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \
76 extra_gyp_defines)" 77 extra_gyp_defines)"
77 export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines" 78 export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines"
78 if echo $extra_gyp_defines | grep -q clang; then 79 if echo $extra_gyp_defines | grep -q clang; then
79 unset CXX_target 80 unset CXX_target
80 fi 81 fi
81 bb_setup_goma_internal 82 bb_setup_goma_internal
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 ) 315 )
315 } 316 }
316 317
317 # Retrieve a packed json property using python 318 # Retrieve a packed json property using python
318 function bb_get_json_prop { 319 function bb_get_json_prop {
319 local JSON="$1" 320 local JSON="$1"
320 local PROP="$2" 321 local PROP="$2"
321 322
322 python -c "import json; print json.loads('$JSON').get('$PROP', '')" 323 python -c "import json; print json.loads('$JSON').get('$PROP', '')"
323 } 324 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698