summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 22:25:38 +0000
committerilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 22:25:38 +0000
commitf9ce7b084f1d6d6baa0336f1f9600def1bf0e5cd (patch)
tree26e03cd937179ac631de93abec386dadf769f096 /build
parent218ee0cff52fdd971551832cec62b3fc9778115e (diff)
downloadchromium_src-f9ce7b084f1d6d6baa0336f1f9600def1bf0e5cd.zip
chromium_src-f9ce7b084f1d6d6baa0336f1f9600def1bf0e5cd.tar.gz
chromium_src-f9ce7b084f1d6d6baa0336f1f9600def1bf0e5cd.tar.bz2
Move android compile setup into compile buildstep
TBR=yaron BUG= Review URL: https://codereview.chromium.org/11078003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/buildbot/buildbot_functions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index d9e8752..7513726 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -151,10 +151,10 @@ function bb_goma_ninja {
# Compile step
function bb_compile {
- bb_compile_setup
# This must be named 'compile', not 'Compile', for CQ interaction.
# Talk to maruel for details.
echo "@@@BUILD_STEP compile@@@"
+ bb_compile_setup
BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
if [[ $BUILDTOOL = ninja ]]; then