diff options
| author | Ying Wang <wangying@google.com> | 2014-06-30 17:36:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-30 17:36:39 +0000 |
| commit | 556efe002f852dfa5ca5331e92b1d65a32339f26 (patch) | |
| tree | a7693f8f32b0c84a2648898ed8cac3cf61303396 | |
| parent | da92aef762fbdf60245746932354998515b68d57 (diff) | |
| parent | 9e05c9e4e642673dc6d9104c44d26810773c382d (diff) | |
| download | build-556efe002f852dfa5ca5331e92b1d65a32339f26.zip build-556efe002f852dfa5ca5331e92b1d65a32339f26.tar.gz build-556efe002f852dfa5ca5331e92b1d65a32339f26.tar.bz2 | |
am 9e05c9e4: 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/.r
* commit '9e05c9e4e642673dc6d9104c44d26810773c382d':
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 cfb7bcf..e462b71 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -169,9 +169,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. |