diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:12:24 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:12:24 +0000 |
| commit | 4e2e2e2a8f5a75d2795b96ce7b1d8de677634611 (patch) | |
| tree | 3d79d330ee932e68da0ebd58b467950cd17eac8a /build | |
| parent | f8ba13ddfaf769ade709cf4ce205a009521a7c09 (diff) | |
| download | chromium_src-4e2e2e2a8f5a75d2795b96ce7b1d8de677634611.zip chromium_src-4e2e2e2a8f5a75d2795b96ce7b1d8de677634611.tar.gz chromium_src-4e2e2e2a8f5a75d2795b96ce7b1d8de677634611.tar.bz2 | |
Add Android SDK to system path
As the requirement of third_party/android/testrunner, the Android SDK needs in the system path.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8380026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/envsetup.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index efd8c87..1f0e986 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 |