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

Commit 9b16b129 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "Switch to new locations of toolchains"

parents 11e0192d a50ef1c1

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) 
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)

TARGET_TOOLS_PREFIX := \

	prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-

	prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi-

endif



# Only define these if there's actually a gcc in there.

core/combo/TARGET_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ endif 
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)

TARGET_TOOLS_PREFIX := \

	prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin/i686-android-linux-

	prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3/bin/i686-android-linux-

endif



TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

core/dumpvar.mk

+3 −2
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) 
endif



# Add the toolchain bin dir if it actually exists

ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),)

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)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin

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

endif

ANDROID_BUILD_PATHS := $(ABP)

ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG)



# The "dumpvar" stuff lets you say something like

#

envsetup.sh

+3 −2
Original line number Diff line number Diff line
@@ -112,13 +112,14 @@ function setpaths() 
    # and in with the new

    CODE_REVIEWS=

    prebuiltdir=$(getprebuilt)

    gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS)



    # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.

    export ANDROID_EABI_TOOLCHAIN=

    case $(get_build_var TARGET_ARCH) in

        x86) toolchaindir=toolchain/i686-android-linux-4.4.3/bin

        x86) toolchaindir=x86/i686-android-linux-4.4.3/bin

            ;;

        arm|*) toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin

        arm|*) toolchaindir=arm/arm-linux-androideabi-4.6/bin

            ;;

    esac

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

tools/adbs

+3 −3
Original line number Diff line number Diff line
@@ -144,13 +144,13 @@ def SetupToolsPath(): 
      uname = "darwin-ppc"

  elif uname == "Linux":

    uname = "linux-x86"

  prefix = "./prebuilt/" + uname + "/toolchain/arm-linux-androideabi-4.4.x/bin/"

  prefix = "./prebuilts/gcc/" + uname + "/arm/arm-linux-androideabi-4.6/bin/"

  addr2line_cmd = prefix + "arm-linux-androideabi-addr2line"



  if (not os.path.exists(addr2line_cmd)):

    try:

      prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilt/" + uname + \

               "/toolchain/arm-linux-androideabi-4.4.x/bin/"

      prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilts/gcc/" + uname + \

               "/arm/arm-linux-androideabi-4.6/bin/"

    except:

      prefix = "";