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

Unified Diff: build/android/envsetup.sh

Issue 8380026: Add Android SDK to system path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index efd8c877dd7ebab3349d7317db09bed6d7ad7e65..1f0e986c11adfd2eac7a62d040648eeedc428d00 100644
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -18,8 +18,16 @@
if [ ! -d "${ANDROID_NDK_ROOT}" ]; then
echo "ANDROID_NDK_ROOT must be set to the path of Android NDK, Revision 6b." \
>& 2
- echo "which could be downloaded from" >& 2
- echo "http://developer.android.com/sdk/ndk/index.html" >& 2
+ echo "which could be installed by" >& 2
+ echo "<chromium_tree>/src/build/install-build-deps-android.sh" >& 2
+ return 1
+fi
+
+if [ ! -d "${ANDROID_SDK_ROOT}" ]; then
+ echo "ANDROID_SDK_ROOT must be set to the path of Android SDK, Android 3.2." \
+ >& 2
+ echo "which could be installed by" >& 2
+ echo "<chromium_tree>/src/build/install-build-deps-android.sh" >& 2
return 1
fi
@@ -39,6 +47,9 @@ esac
export ANDROID_TOOLCHAIN="${ANDROID_NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/${toolchain_dir}/bin/"
+# Add Android SDK's platform-tools to system path.
+export PATH="${PATH}:${ANDROID_SDK_ROOT}/platform-tools/"
+
if [ ! -d "${ANDROID_TOOLCHAIN}" ]; then
echo "Can not find Android toolchain in ${ANDROID_TOOLCHAIN}." >& 2
echo "The NDK version might be wrong." >& 2
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698