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

Commit 129ab633 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

resolve merge conflicts of 0c8b471b to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I81ec8e0660100eabdc0664cfc37198e95be95ae2
parents 5099d1a3 0c8b471b

envsetup.sh

+6 −1
Original line number Diff line number Diff line
@@ -237,7 +237,12 @@ function setpaths() 
            ;;

    esac



    export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_TOOLCHAIN:$ANDROID_TOOLCHAIN_2ND_ARCH:$ANDROID_DEV_SCRIPTS:

    ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_TOOLCHAIN

    if [ -n "$ANDROID_TOOLCHAIN_2ND_ARCH" ]; then

        ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_TOOLCHAIN_2ND_ARCH

    fi

    ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_DEV_SCRIPTS:

    export ANDROID_BUILD_PATHS



    # If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH

    # to ensure that the corresponding 'emulator' binaries are used.