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

Commit 35b24a82 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 8776f34a: Merge "x86: cleanups for toolchain" 

* commit '8776f34a':
  x86: cleanups for toolchain
parents a4814370 8776f34a

core/dumpvar.mk

+10 −7
Original line number Diff line number Diff line
@@ -10,16 +10,19 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) 
endif



# Add the ARM toolchain bin dir if it actually exists

ifeq ($(TARGET_ARCH),arm)

    ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin),)

        # this should be copied to HOST_OUT_EXECUTABLES instead

        ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin

    endif

else ifeq ($(TARGET_ARCH),x86)



# Add the x86 toolchain bin dir if it actually exists

    ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin),)

        # this should be copied to HOST_OUT_EXECUTABLES instead

        ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin

    endif

endif

ANDROID_BUILD_PATHS := $(ABP)

ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG)

envsetup.sh

+9 −10
Original line number Diff line number Diff line
@@ -131,25 +131,24 @@ function setpaths() 
        export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir

    fi



    export ARM_EABI_TOOLCHAIN=

    unset ARM_EABI_TOOLCHAIN ARM_EABI_TOOLCHAIN_PATH

    case $ARCH in

        x86) toolchaindir=x86/i686-eabi-4.4.3/bin

            ;;

        arm) toolchaindir=arm/arm-eabi-4.6/bin

        arm)

            toolchaindir=arm/arm-eabi-4.6/bin

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

                 export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"

                 ARM_EABI_TOOLCHAIN_PATH=":$gccprebuiltdir/$toolchaindir"

            fi

            ;;

        *)

            echo "Can't find toolchain for unknown architecture: $ARCH"

            toolchaindir=xxxxxxxxx

            # No need to set ARM_EABI_TOOLCHAIN for other ARCHs

            ;;

    esac

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

        export ARM_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir

    fi



    export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN

    export ANDROID_QTOOLS=$T/development/emulator/qtools

    export ANDROID_DEV_SCRIPTS=$T/development/scripts

    export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ARM_EABI_TOOLCHAIN$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS

    export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN$ARM_EABI_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS

    export PATH=$PATH$ANDROID_BUILD_PATHS



    unset ANDROID_JAVA_TOOLCHAIN