diff options
author | navabi@chromium.org <navabi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 17:53:06 +0000 |
---|---|---|
committer | navabi@chromium.org <navabi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 17:53:06 +0000 |
commit | 3a1b4164a928fefac3a6eaf5367db7e7ec81b680 (patch) | |
tree | 845568052888552b8060b619c611a4c929226c38 | |
parent | 16efc1793838850833e68d0d6b4e453ab7be34ef (diff) | |
download | chromium_src-3a1b4164a928fefac3a6eaf5367db7e7ec81b680.zip chromium_src-3a1b4164a928fefac3a6eaf5367db7e7ec81b680.tar.gz chromium_src-3a1b4164a928fefac3a6eaf5367db7e7ec81b680.tar.bz2 |
Use the NDK that has been checked into android_tools.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10828242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151080 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-x | build/android/buildbot_functions.sh | 11 | ||||
-rwxr-xr-x | build/android/envsetup_functions.sh | 7 |
2 files changed, 3 insertions, 15 deletions
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh index a848d282..f5aabdc6 100755 --- a/build/android/buildbot_functions.sh +++ b/build/android/buildbot_functions.sh @@ -34,15 +34,6 @@ function bb_parse_args { done } - -# Setup environment for Android build. Do not set ANDROID_SDK_ROOT so that -# default version from $ROOT/src/third_party/android_tools/ -# Called from bb_baseline_setup. -# Moved to top of file so it is easier to find. -function bb_setup_environment { - export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7 -} - # Function to force-green a bot. function bb_force_bot_green_and_exit { echo "@@@BUILD_STEP Bot forced green.@@@" @@ -79,8 +70,6 @@ function bb_baseline_setup { return 1 fi - bb_setup_environment - for mandatory_directory in $(dirname "${ANDROID_SDK_ROOT}") \ $(dirname "${ANDROID_NDK_ROOT}") ; do if [[ ! -d "${mandatory_directory}" ]]; then diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index 0c7a2a0..128d78f 100755 --- a/build/android/envsetup_functions.sh +++ b/build/android/envsetup_functions.sh @@ -146,11 +146,10 @@ common_gyp_vars() { # > make ################################################################################ sdk_build_init() { + # If ANDROID_NDK_ROOT is set when envsetup is run, use the ndk pointed to by + # the environment variable. Otherwise, use the default ndk from the tree. if [ ! -d "${ANDROID_NDK_ROOT}" ]; then - echo "ANDROID_NDK_ROOT must be set to the path of Android NDK." >& 2 - echo "which could be installed by" >& 2 - echo "<chromium_tree>/src/build/install-build-deps-android-sdk.sh" >& 2 - return 1 + export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/" fi # If ANDROID_SDK_ROOT is set when envsetup is run, use the sdk pointed to by |