| 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 17 matching lines...) Expand all Loading... |
| 28 *) | 28 *) |
| 29 echo "@@@STEP_WARNINGS@@@" | 29 echo "@@@STEP_WARNINGS@@@" |
| 30 echo "Warning, unparsed input argument: '$1'" | 30 echo "Warning, unparsed input argument: '$1'" |
| 31 ;; | 31 ;; |
| 32 esac | 32 esac |
| 33 shift | 33 shift |
| 34 done | 34 done |
| 35 } | 35 } |
| 36 | 36 |
| 37 | 37 |
| 38 # Setup environment for Android build. | 38 # Setup environment for Android build. Do not set ANDROID_SDK_ROOT so that |
| 39 # default version from $ROOT/src/third_party/android_tools/ |
| 39 # Called from bb_baseline_setup. | 40 # Called from bb_baseline_setup. |
| 40 # Moved to top of file so it is easier to find. | 41 # Moved to top of file so it is easier to find. |
| 41 function bb_setup_environment { | 42 function bb_setup_environment { |
| 42 export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux | |
| 43 export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7 | 43 export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7 |
| 44 } | 44 } |
| 45 | 45 |
| 46 # Install the build deps by running | 46 # Install the build deps by running |
| 47 # build/install-build-deps-android-sdk.sh. This may update local tools. | 47 # build/install-build-deps-android-sdk.sh. This may update local tools. |
| 48 # $1: source root. | 48 # $1: source root. |
| 49 function bb_install_build_deps { | 49 function bb_install_build_deps { |
| 50 echo "@@@BUILD_STEP install build deps android@@@" | 50 echo "@@@BUILD_STEP install build deps android@@@" |
| 51 local script="$1/build/install-build-deps-android-sdk.sh" | 51 local script="$1/build/install-build-deps-android-sdk.sh" |
| 52 if [[ -f "$script" ]]; then | 52 if [[ -f "$script" ]]; then |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 --factory-properties "$FACTORY_PROPERTIES" \ | 292 --factory-properties "$FACTORY_PROPERTIES" \ |
| 293 --build-properties "$BUILD_PROPERTIES" | 293 --build-properties "$BUILD_PROPERTIES" |
| 294 extract_exitcode=$? | 294 extract_exitcode=$? |
| 295 if (( $extract_exitcode > 1 )); then | 295 if (( $extract_exitcode > 1 )); then |
| 296 echo "@@@STEP_WARNINGS@@@" | 296 echo "@@@STEP_WARNINGS@@@" |
| 297 return | 297 return |
| 298 fi | 298 fi |
| 299 return $extract_exitcode | 299 return $extract_exitcode |
| 300 ) | 300 ) |
| 301 } | 301 } |
| OLD | NEW |