diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-11 04:23:06 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-11 04:23:06 -0800 |
| commit | cb8f66305caf4f9252112608ad93e2ef58321244 (patch) | |
| tree | 39e50f8e1a5ec7a46da2d88074f0b317c3b79a85 /tools/adbs | |
| parent | dfd93fc209a0fec27bf92b8e139ea25f46e0f514 (diff) | |
| download | build-cb8f66305caf4f9252112608ad93e2ef58321244.zip build-cb8f66305caf4f9252112608ad93e2ef58321244.tar.gz build-cb8f66305caf4f9252112608ad93e2ef58321244.tar.bz2 | |
Revert "Point arm toolchain to the new gcc-4.6 one."
This reverts commit 1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.
Diffstat (limited to 'tools/adbs')
| -rwxr-xr-x | tools/adbs | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 = ""; |