Commit f82480eb authored by ilevy@chromium.org's avatar ilevy@chromium.org

Add android device status check and misc cleanup

- Adding hook to print device information
- Removing some unnecessary buildbot steps

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10829005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148395 0039d316-1c4b-4281-b951-d872f2087c98
parent 2942a2ef
...@@ -73,7 +73,7 @@ function bb_run_gclient_hooks { ...@@ -73,7 +73,7 @@ function bb_run_gclient_hooks {
# $1: source root. # $1: source root.
# $2 and beyond: key value pairs which are parsed by bb_parse_args. # $2 and beyond: key value pairs which are parsed by bb_parse_args.
function bb_baseline_setup { function bb_baseline_setup {
echo "@@@BUILD_STEP cd into source root@@@" echo "@@@BUILD_STEP Environment setup@@@"
SRC_ROOT="$1" SRC_ROOT="$1"
# Remove SRC_ROOT param # Remove SRC_ROOT param
shift shift
...@@ -93,7 +93,6 @@ function bb_baseline_setup { ...@@ -93,7 +93,6 @@ function bb_baseline_setup {
return 1 return 1
fi fi
echo "@@@BUILD_STEP Basic setup@@@"
bb_setup_environment bb_setup_environment
for mandatory_directory in $(dirname "${ANDROID_SDK_ROOT}") \ for mandatory_directory in $(dirname "${ANDROID_SDK_ROOT}") \
...@@ -115,7 +114,6 @@ function bb_baseline_setup { ...@@ -115,7 +114,6 @@ function bb_baseline_setup {
bb_install_build_deps $SRC_ROOT bb_install_build_deps $SRC_ROOT
fi fi
echo "@@@BUILD_STEP Configure with envsetup.sh@@@"
. build/android/envsetup.sh . build/android/envsetup.sh
if [ "$NEED_CLOBBER" -eq 1 ]; then if [ "$NEED_CLOBBER" -eq 1 ]; then
...@@ -129,6 +127,8 @@ function bb_baseline_setup { ...@@ -129,6 +127,8 @@ function bb_baseline_setup {
# Should be called only after envsetup is done. # Should be called only after envsetup is done.
bb_run_gclient_hooks bb_run_gclient_hooks
python build/android/device_status_check.py
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment