diff options
author | Elliott Hughes <enh@google.com> | 2014-07-01 21:00:22 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-01 19:26:36 +0000 |
commit | 401448709d3a58d7f33bbb2ce1e609f7f692b628 (patch) | |
tree | 2b39a78d657a301cab675e330df761b1fe878775 | |
parent | d03c4985e775b8b7a8126bb32de014766f5a8695 (diff) | |
parent | 1ba94df0c91c3a4cca34d4a41d641f59b454d8f3 (diff) | |
download | android_development-401448709d3a58d7f33bbb2ce1e609f7f692b628.tar.gz android_development-401448709d3a58d7f33bbb2ce1e609f7f692b628.tar.bz2 android_development-401448709d3a58d7f33bbb2ce1e609f7f692b628.zip |
Merge "Fix FindToolchain for mips."
-rwxr-xr-x | scripts/symbol.py | 8 |
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)) |