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

Commit 0c13efb4 authored by Jing Yu's avatar Jing Yu Committed by Android (Google) Code Review
Browse files

Merge "Point arm toolchain to the new gcc-4.6 one."

parents fad6b161 1f87795e

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) 


# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

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

TARGET_TOOLCHAIN_ROOT := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6

TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/arm-linux-androideabi-

endif

core/dumpvar.mk

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



# Add the ARM 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



# Add the x86 toolchain bin dir if it actually exists
@@ -22,6 +22,7 @@ ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-li 
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

+4 −3
Original line number Diff line number Diff line
@@ -112,12 +112,13 @@ 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=

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

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

        export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir

    toolchaindir=arm/arm-linux-androideabi-4.6/bin

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

        export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir

    fi



    export ARM_EABI_TOOLCHAIN=

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 = "";