StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jing Yu
2012-01-06 20:29:15 -08:00
committed by Android (Google) Code Review
parent fad6b161f4 1f87795eef
commit 0c13efb418
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/TARGET_linux-arm.mk
View File

@@ -43,7 +43,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) 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- TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/arm-linux-androideabi-
endif endif

5
core/dumpvar.mk
View File

@@ -10,9 +10,9 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)
endif endif
# Add the ARM toolchain bin dir if it actually exists # 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 # 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 endif
# Add the x86 toolchain bin dir if it actually exists # 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 endif
ANDROID_BUILD_PATHS := $(ABP) ANDROID_BUILD_PATHS := $(ABP)
ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)
ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG)
# The "dumpvar" stuff lets you say something like # The "dumpvar" stuff lets you say something like
# #

7
envsetup.sh
View File

@@ -112,12 +112,13 @@ function setpaths()
# and in with the new # and in with the new
CODE_REVIEWS= CODE_REVIEWS=
prebuiltdir=$(getprebuilt) 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. # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
export ANDROID_EABI_TOOLCHAIN= export ANDROID_EABI_TOOLCHAIN=
toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin toolchaindir=arm/arm-linux-androideabi-4.6/bin
if [ -d "$prebuiltdir/$toolchaindir" ]; then if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir
fi fi
export ARM_EABI_TOOLCHAIN= export ARM_EABI_TOOLCHAIN=

6
tools/adbs
View File

@@ -144,13 +144,13 @@ def SetupToolsPath():
uname = "darwin-ppc" uname = "darwin-ppc"
elif uname == "Linux": elif uname == "Linux":
uname = "linux-x86" 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" addr2line_cmd = prefix + "arm-linux-androideabi-addr2line"
if (not os.path.exists(addr2line_cmd)): if (not os.path.exists(addr2line_cmd)):
try: try:
prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilt/" + uname + \ prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilts/gcc/" + \
"/toolchain/arm-linux-androideabi-4.4.x/bin/" uname + "/arm/arm-linux-androideabi-4.6/bin/"
except: except:
prefix = ""; prefix = "";