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

Unified Diff: build/android/envsetup_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 | « build/android/buildbot_functions.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 0c7a2a0db821a96d1f55b0400e60e5cb4d1e25c7..128d78fcf3078a20508e539d1983fe0bbe1b993b 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
« no previous file with comments | « build/android/buildbot_functions.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698