Permalink
Browse files

Revert "Switch to new locations of toolchains"

This reverts commit a50ef1c.

Conflicts:

	core/combo/TARGET_linux-x86.mk
	envsetup.sh
  • Loading branch information...
1 parent af0f256 commit e2628d130ad5dac218deb60b183e0b0fc1ee1319 @michaelwu michaelwu committed May 22, 2012
Showing with 9 additions and 11 deletions.
  1. +1 −1 core/combo/TARGET_linux-arm.mk
  2. +1 −1 core/combo/TARGET_linux-x86.mk
  3. +2 −3 core/dumpvar.mk
  4. +2 −3 envsetup.sh
  5. +3 −3 tools/adbs
@@ -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 := \
- prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi-
+ prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-
endif
# Only define these if there's actually a gcc in there.
@@ -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 := \
- prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin/i686-linux-android-
+ prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin/i686-android-linux-
endif
TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)
View
@@ -10,13 +10,12 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)
endif
# Add the toolchain bin dir if it actually exists
-ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin),)
+ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),)
# this should be copied to HOST_OUT_EXECUTABLES instead
- ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin
+ ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/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
#
View
@@ -112,14 +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=
case $(get_build_var TARGET_ARCH) in
- x86) toolchaindir=x86/i686-linux-android-4.6/bin
+ x86) toolchaindir=toolchain/i686-android-linux-4.4.3/bin
;;
- arm|*) toolchaindir=arm/arm-linux-androideabi-4.6/bin
+ arm|*) toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
;;
esac
if [ -d "$prebuiltdir/$toolchaindir" ]; then
View
@@ -144,13 +144,13 @@ def SetupToolsPath():
uname = "darwin-ppc"
elif uname == "Linux":
uname = "linux-x86"
- prefix = "./prebuilts/gcc/" + uname + "/arm/arm-linux-androideabi-4.6/bin/"
+ prefix = "./prebuilt/" + uname + "/toolchain/arm-linux-androideabi-4.4.x/bin/"
addr2line_cmd = prefix + "arm-linux-androideabi-addr2line"
if (not os.path.exists(addr2line_cmd)):
try:
- prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilts/gcc/" + uname + \
- "/arm/arm-linux-androideabi-4.6/bin/"
+ prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilt/" + uname + \
+ "/toolchain/arm-linux-androideabi-4.4.x/bin/"
except:
prefix = "";

0 comments on commit e2628d1

Please sign in to comment.