diff options
| author | Ying Wang <wangying@google.com> | 2014-06-30 17:32:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-30 17:32:05 +0000 |
| commit | 9e05c9e4e642673dc6d9104c44d26810773c382d (patch) | |
| tree | 9d420ca6ef0414559c36981c4bd0f5dadf3f09ea | |
| parent | 8625b6e74ae33db8ce7d18c131ba3d87f121d1f3 (diff) | |
| parent | dc58c2a6c216577110682521fa787fd9640cc89d (diff) | |
| download | build-9e05c9e4e642673dc6d9104c44d26810773c382d.zip build-9e05c9e4e642673dc6d9104c44d26810773c382d.tar.gz build-9e05c9e4e642673dc6d9104c44d26810773c382d.tar.bz2 | |
am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/usr/lib/google-golang/bin:/usr/local/buildtools/java/jdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/buildbot/automergers:/buildbot/automergers."
* commit 'dc58c2a6c216577110682521fa787fd9640cc89d':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
| -rw-r--r-- | envsetup.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh index fcf1b26..34b52e5 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -168,9 +168,8 @@ function setpaths() ;; esac - export ANDROID_QTOOLS=$T/development/emulator/qtools export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools - export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_TOOLCHAIN_2ND_ARCH:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS: + export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_TOOLCHAIN:$ANDROID_TOOLCHAIN_2ND_ARCH:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS: # If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH # to ensure that the corresponding 'emulator' binaries are used. |