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

am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3

Browse Source 
Merge commit 'ada132a80ba7edde00ac71727a205d55578e3f47' into gingerbread-plus-aosp

* commit 'ada132a80ba7edde00ac71727a205d55578e3f47':
  Switch toolchain from gcc-4.4.0 to gcc-4.4.3
This commit is contained in:
Jing Yu
2010-06-16 20:44:14 -07:00
committed by Android Git Automerger
parent b6bee6f171 ada132a80b
commit eed926c889
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,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_TOOLS_PREFIX := \ TARGET_TOOLS_PREFIX := \
prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.0/bin/arm-eabi- prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
endif endif
TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

2
core/envsetup.mk
View File

@@ -284,7 +284,7 @@ ifeq ($(TARGET_SIMULATOR),true)
ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES) ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES)
else else
# 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-eabi-4.4.0/bin ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.3/bin
endif endif
ANDROID_BUILD_PATHS := $(ABP) ANDROID_BUILD_PATHS := $(ABP)
ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

2
envsetup.sh
View File

@@ -103,7 +103,7 @@ function setpaths()
# and in with the new # and in with the new
CODE_REVIEWS= CODE_REVIEWS=
prebuiltdir=$(getprebuilt) prebuiltdir=$(getprebuilt)
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.0/bin export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.3/bin
export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
export ANDROID_QTOOLS=$T/development/emulator/qtools export ANDROID_QTOOLS=$T/development/emulator/qtools
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS

4
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-eabi-4.4.0/bin/" prefix = "./prebuilt/" + uname + "/toolchain/arm-eabi-4.4.3/bin/"
addr2line_cmd = prefix + "arm-eabi-addr2line" addr2line_cmd = prefix + "arm-eabi-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'] + "/prebuilt/" + uname + \
"/toolchain/arm-eabi-4.4.0/bin/" "/toolchain/arm-eabi-4.4.3/bin/"
except: except:
prefix = ""; prefix = "";