Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1699)

Unified Diff: build/android/buildbot_functions.sh

Issue 10828242: Use the NDK that has been checked into android_tools. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/envsetup_functions.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/buildbot_functions.sh
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index a848d28264faed37ea9a567dfa697aee1ad6591b..f5aabdc694979d93151ee13d396f64c4eb0890ee 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
« no previous file with comments | « no previous file | build/android/envsetup_functions.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698