summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-01 21:10:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-01 21:10:33 +0000
commit9e90620a66dc53d726a43cac0fc2ce93bfb17b03 (patch)
tree397ed2326b7be7f970b3a8f3defdd2f99708e51f /scripts
parent66a811132144957a365f7b941dc1c29d5fd1e70a (diff)
parent81ecf883addc450ed9a6e676dde194270a9b2432 (diff)
downloadandroid_development-9e90620a66dc53d726a43cac0fc2ce93bfb17b03.tar.gz
android_development-9e90620a66dc53d726a43cac0fc2ce93bfb17b03.tar.bz2
android_development-9e90620a66dc53d726a43cac0fc2ce93bfb17b03.zip
am 81ecf883: am 40144870: Merge "Fix FindToolchain for mips."
* commit '81ecf883addc450ed9a6e676dde194270a9b2432': Fix FindToolchain for mips.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/symbol.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/symbol.py b/scripts/symbol.py
index a10621a98..0c97ea1c1 100755
--- a/scripts/symbol.py
+++ b/scripts/symbol.py
@@ -62,17 +62,19 @@ def FindToolchain():
if TOOLCHAIN is not None:
return TOOLCHAIN
- # We say "arm64", GCC says "aarch64".
+ # We use slightly different names from GCC.
gcc_arch = ARCH
if gcc_arch == "arm64":
gcc_arch = "aarch64"
+ elif gcc_arch == "mips":
+ gcc_arch = "mipsel"
tc1 = os.environ["ANDROID_TOOLCHAIN"]
tc2 = os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"]
- if (gcc_arch + "/" + gcc_arch + "-") in tc1:
+ if ("/" + gcc_arch + "-linux-") in tc1:
toolchain = tc1
- elif (gcc_arch + "/" + gcc_arch + "-") in tc2:
+ elif ("/" + gcc_arch + "-linux-") in tc2:
toolchain = tc2
else:
raise Exception("Could not find tool chain for %s" % (gcc_arch))