diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-22 13:49:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-22 13:49:45 +0000 |
| commit | 28faa949b53cc9432845e883bb6773dd24cbeddc (patch) | |
| tree | 27da762efdb34cb8286cbd6eddb4a4e28256b74c /scripts/symbol.py | |
| parent | f93d490356c8cc95811d3ec4cb29071f30c97a64 (diff) | |
| parent | 39d51c9a8c5c782aee2060222a9a9f22eee036bc (diff) | |
am 39d51c9a: am eb96f654: am bc6a6036: Merge "Fix the stack/ tool for 64 bit archs."
* commit '39d51c9a8c5c782aee2060222a9a9f22eee036bc':
Fix the stack/ tool for 64 bit archs.
Diffstat (limited to 'scripts/symbol.py')
| -rwxr-xr-x | scripts/symbol.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/symbol.py b/scripts/symbol.py index a285fac11..8c1fa68de 100755 --- a/scripts/symbol.py +++ b/scripts/symbol.py @@ -79,7 +79,12 @@ def FindToolchain(): return TOOLCHAIN_INFO ## Known toolchains, newer ones in the front. - if ARCH == "arm": + if ARCH == "arm64": + gcc_version = os.environ["TARGET_GCC_VERSION"] + known_toolchains = [ + ("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android") + ] + elif ARCH == "arm": gcc_version = os.environ["TARGET_GCC_VERSION"] known_toolchains = [ ("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi"), @@ -101,6 +106,7 @@ def FindToolchain(): toolchain_info = (label, platform, target); if os.path.exists(ToolPath("addr2line", toolchain_info)): TOOLCHAIN_INFO = toolchain_info + print "Using toolchain from :" + ToolPath("", TOOLCHAIN_INFO) return toolchain_info raise Exception("Could not find tool chain") |