diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-04-23 08:31:53 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-23 08:31:53 -0700 |
| commit | 9b16b1293255be054a84e6f39098c7a35357f636 (patch) | |
| tree | e75933af0f492b51a89863c43b55546242e6c095 | |
| parent | 11e0192d29459aab8f3acebaae113eece492069f (diff) | |
| parent | a50ef1c12441d9eccfa75409c1392befaf2abed5 (diff) | |
| download | build-9b16b1293255be054a84e6f39098c7a35357f636.zip build-9b16b1293255be054a84e6f39098c7a35357f636.tar.gz build-9b16b1293255be054a84e6f39098c7a35357f636.tar.bz2 | |
Merge "Switch to new locations of toolchains"
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 | ||||
| -rw-r--r-- | core/dumpvar.mk | 5 | ||||
| -rw-r--r-- | envsetup.sh | 5 | ||||
| -rwxr-xr-x | tools/adbs | 6 |
5 files changed, 11 insertions, 9 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 4db9bac..77e656b 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -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 := \ - 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 # Only define these if there's actually a gcc in there. diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 3d09276..df5ebee 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -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 := \ - 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 TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) diff --git a/core/dumpvar.mk b/core/dumpvar.mk index aba3c8d..7929dbb 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -10,12 +10,13 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) endif # 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 - 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 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 # diff --git a/envsetup.sh b/envsetup.sh index e7fbcb4..609e1af 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -112,13 +112,14 @@ 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=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 if [ -d "$prebuiltdir/$toolchaindir" ]; then @@ -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 = ""; |