diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 21:16:20 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 21:16:20 +0000 |
| commit | 61fdbf21e8d3d8f78f3fcd763c2f5731e6706f89 (patch) | |
| tree | 48874cc4af08f3b09148e0935e2cbe15a6fafe47 /build | |
| parent | bf470dfc65d77f55c0f31cb4532d3f79bbd412f6 (diff) | |
| download | chromium_src-61fdbf21e8d3d8f78f3fcd763c2f5731e6706f89.zip chromium_src-61fdbf21e8d3d8f78f3fcd763c2f5731e6706f89.tar.gz chromium_src-61fdbf21e8d3d8f78f3fcd763c2f5731e6706f89.tar.bz2 | |
Add ${ANDROID_TOOLCHAIN} to $PATH to assist ninja.
Also minor upstreaming command movement.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10382177
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index dcf51ee..6ed168d 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -73,6 +73,12 @@ esac toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}/prebuilt/" export ANDROID_TOOLCHAIN="${toolchain_path}/${toolchain_dir}/bin/" +if [ ! -d "${ANDROID_TOOLCHAIN}" ]; then + echo "Can not find Android toolchain in ${ANDROID_TOOLCHAIN}." >& 2 + echo "The NDK version might be wrong." >& 2 + return 1 +fi + export ANDROID_SDK_VERSION="15" # Needed by android antfiles when creating apks. @@ -82,12 +88,8 @@ export ANDROID_SDK_HOME=${ANDROID_SDK_ROOT} export PATH=$PATH:${ANDROID_NDK_ROOT} export PATH=$PATH:${ANDROID_SDK_ROOT}/tools 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 - return 1 -fi +# Must have tools like arm-linux-androideabi-gcc on the path for ninja +export PATH=$PATH:${ANDROID_TOOLCHAIN} if [ -z "${CHROME_SRC}" ]; then # If $CHROME_SRC was not set, assume current directory is CHROME_SRC. |