Chromium Code Reviews| Index: build/android/buildbot_functions.sh |
| diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh |
| index 962ce52e7912673a308dad6ff8ec971957c37417..5f9f3b94ab9469459d684020c3348e5c40b6372a 100755 |
| --- a/build/android/buildbot_functions.sh |
| +++ b/build/android/buildbot_functions.sh |
| @@ -183,9 +183,9 @@ function bb_goma_make { |
| COMMON_JAVAC="$COMMON_JAVAC" \ |
| "$@" |
| - local make_exit_status=$? |
| + local make_exit_code=$? |
| bb_stop_goma_internal |
| - return $make_exit_status |
| + return $make_exit_code |
| } |
| # Compile step |
| @@ -282,12 +282,12 @@ function bb_extract_build { |
| --target Release \ |
| --factory-properties "$FACTORY_PROPERTIES" \ |
| --build-properties "$BUILD_PROPERTIES" |
| - extract_exitcode=$? |
| - if (( $extract_exitcode > 1 )); then |
| + local extract_exit_code=$? |
| + if (( $extract_exit_code > 1 )); then |
| echo "@@@STEP_WARNINGS@@@" |
| return |
| fi |
| - return $extract_exitcode |
| + return $extract_exit_code |
| ) |
| } |
| @@ -305,3 +305,18 @@ function bb_reboot_phones { |
| wait |
| ) |
| } |
| + |
| +# Runs the license checker for the WebView build. |
| +function bb_check_webview_licenses { |
| + echo "@@@BUILD_STEP Check licenses for WebView@@@" |
| + ( |
| + set +e |
| + cd "${SRC_ROOT}" |
| + python android_webview/tools/webview_licenses.py scan |
| + local license_exit_code = $? |
| + if [[ license_exit_code -ne 0 ]]; then |
| + echo "@@@STEP_FAILURE@@@" |
|
Peter Beverloo
2012/08/17 11:40:45
To confirm: this means that the builder turns red
|
| + fi |
| + return $license_exit_code |
|
Peter Beverloo
2012/08/17 11:40:45
nit: The return doesn't seem necessary, as it isn'
|
| + ) |
| +} |