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

Commit 7250b63a authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Gerrit Code Review
Browse files

Merge "Fix PATH setup for arm64."

parents 676e11fe f24c356a

envsetup.sh

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

    fi





    # and in with the new

    # and in with the new

    CODE_REVIEWS=

    prebuiltdir=$(getprebuilt)

    prebuiltdir=$(getprebuilt)

    gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS)

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

            # Legacy toolchain configuration used for ARM kernel compilation

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

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

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

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

                 ANDROID_KERNEL_TOOLCHAIN_PATH="$gccprebuiltdir/$toolchaindir"

                 export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"

                 export ARM_EABI_TOOLCHAIN=$ANDROID_KERNEL_TOOLCHAIN_PATH

                 ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":

            fi

            fi

            ;;

            ;;

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

            ;;

        *)

        *)

            # No need to set ARM_EABI_TOOLCHAIN for other ARCHs

            # No need to set ARM_EABI_TOOLCHAIN for other ARCHs

            ;;

            ;;
@@ -173,7 +170,7 @@ function setpaths() 




    export ANDROID_QTOOLS=$T/development/emulator/qtools

    export ANDROID_QTOOLS=$T/development/emulator/qtools

    export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools

    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

    export PATH=$ANDROID_BUILD_PATHS$PATH





    unset ANDROID_JAVA_TOOLCHAIN

    unset ANDROID_JAVA_TOOLCHAIN