StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9b16b129: Merge "Switch to new locations of toolchains"

Browse Source 
* commit '9b16b1293255be054a84e6f39098c7a35357f636':
  Switch to new locations of toolchains
This commit is contained in:
Jean-Baptiste Queru
2012-04-23 09:23:58 -07:00
committed by Android Git Automerger
parent acd812d6a7 9b16b12932
commit 695a2b3fd9
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/adbs
View File

@@ -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 = "";