summaryrefslogtreecommitdiffstats
path: root/tools/adbs
diff options
context:
space:
mode:
authorJing Yu <jingyu@google.com>2012-03-29 20:45:50 -0700
committerJing Yu <jingyu@google.com>2012-03-29 20:45:50 -0700
commitf5172c7564e0d84bf02b9add47809ce10a9cff4f (patch)
tree3e76de9743b59a989483413dd8796af1aa2a4cf2 /tools/adbs
parent971c246cb543b0021f78d52333bcbbe00ca106d8 (diff)
downloadbuild-f5172c7564e0d84bf02b9add47809ce10a9cff4f.zip
build-f5172c7564e0d84bf02b9add47809ce10a9cff4f.tar.gz
build-f5172c7564e0d84bf02b9add47809ce10a9cff4f.tar.bz2
Switch default gcc toolchain from 4.4.3 to 4.6.
Switch both arm-linux-androideabi toolchainand arm-eabi toolchain. Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
Diffstat (limited to 'tools/adbs')
-rwxr-xr-xtools/adbs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/adbs b/tools/adbs
index 1a400f7..598af85 100755
--- a/tools/adbs
+++ b/tools/adbs
@@ -140,13 +140,13 @@ def SetupToolsPath():
uname = "darwin-x86"
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 = "";