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

Commit 93d0245b authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android Git Automerger
Browse files

am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64." 

* commit '5646d2f6':
  Fix PATH setup for arm64.
parents d4cc9dad 5646d2f6

envsetup.sh

+3 −6
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ function setpaths() 
    fi



    # and in with the new

    CODE_REVIEWS=

    prebuiltdir=$(getprebuilt)

    gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS)
@@ -161,12 +160,10 @@ function setpaths() 
            # Legacy toolchain configuration used for ARM kernel compilation

            toolchaindir=arm/arm-eabi-$targetgccversion/bin

            if [ -d "$gccprebuiltdir/$toolchaindir" ]; then

                 ANDROID_KERNEL_TOOLCHAIN_PATH="$gccprebuiltdir/$toolchaindir"

                 export ARM_EABI_TOOLCHAIN=$ANDROID_KERNEL_TOOLCHAIN_PATH

                 export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"

                 ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":

            fi

            ;;

        mips) toolchaindir=mips/mips-eabi-4.4.3/bin

            ;;

        *)

            # No need to set ARM_EABI_TOOLCHAIN for other ARCHs

            ;;
@@ -174,7 +171,7 @@ function setpaths() 


    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_KERNEL_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS:

    export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS:

    export PATH=$ANDROID_BUILD_PATHS$PATH



    unset ANDROID_JAVA_TOOLCHAIN