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.
This commit is contained in:
@@ -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.
|
||||
|
Reference in New Issue
Block a user