Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 556efe00 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from... 

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 '9e05c9e4':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
parents da92aef7 9e05c9e4

envsetup.sh

+1 −2
Original line number Diff line number Diff line
@@ -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.