summaryrefslogtreecommitdiffstats
path: root/tools/adbs
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-03-13 16:56:17 -0700
committerRomain Guy <romainguy@google.com>2012-03-13 16:57:08 -0700
commitaaf01f48ee2c84019edf8c76d0770a69994112b4 (patch)
tree70b97fcd2a7665de0fd9d2f4651e0553a28482f3 /tools/adbs
parentcd1b924e37162274d2b8998fadfbf39b900e7115 (diff)
downloadbuild-aaf01f48ee2c84019edf8c76d0770a69994112b4.zip
build-aaf01f48ee2c84019edf8c76d0770a69994112b4.tar.gz
build-aaf01f48ee2c84019edf8c76d0770a69994112b4.tar.bz2
Make adbs work again on Darwin x86.
We don't support building on Darwin PPC so let's always assume x86. Change-Id: I079a4040f1c0a144d4cdd1e2b3d2a183c00bf7b0
Diffstat (limited to 'tools/adbs')
-rwxr-xr-xtools/adbs6
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/adbs b/tools/adbs
index b571d48..1a400f7 100755
--- a/tools/adbs
+++ b/tools/adbs
@@ -137,11 +137,7 @@ def SetupToolsPath():
uname = os.uname()[0]
if uname == "Darwin":
- proc = os.uname()[-1]
- if proc == "i386":
- uname = "darwin-x86"
- else:
- uname = "darwin-ppc"
+ uname = "darwin-x86"
elif uname == "Linux":
uname = "linux-x86"
prefix = "./prebuilt/" + uname + "/toolchain/arm-linux-androideabi-4.4.x/bin/"