tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Switch to new locations of toolchains"

Browse source
This commit is contained in:
Jean-Baptiste Queru 2012-04-23 08:31:53 -07:00 committed by android code review
commit 9b16b12932
5 changed files with 11 additions and 9 deletions
Show stats 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-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 endif
# Only define these if there's actually a gcc in there. # Only define these if there's actually a gcc in there.

2
core/combo/TARGET_linux-x86.mk
View file

@ -25,7 +25,7 @@ endif
# 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/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 endif
TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

5
core/dumpvar.mk
View file

@ -10,12 +10,13 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)
endif endif
# Add the toolchain bin dir if it actually exists # 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 # 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
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
# #

5
envsetup.sh
View file

@ -112,13 +112,14 @@ 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=
case $(get_build_var TARGET_ARCH) in 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 esac
if [ -d "$prebuiltdir/$toolchaindir" ]; then if [ -d "$prebuiltdir/$toolchaindir" ]; then

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/" + uname + \
"/toolchain/arm-linux-androideabi-4.4.x/bin/" "/arm/arm-linux-androideabi-4.6/bin/"
except: except:
prefix = ""; prefix = "";