diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-07 22:20:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-02 20:52:16 +0000 |
| commit | 17d35eafc639a9d66b73a4d55851a907ec31c20c (patch) | |
| tree | 4a7d66e82653055a268dfffb0690b6ec32cd1dd5 /scripts/symbol.py | |
| parent | afab5877eed9a7a4cc28811c0a08c4283454c748 (diff) | |
| parent | c3166bec1cffd98b648fa163238f6424db3c27db (diff) | |
Merge "Fix symbol.py's toolchain detection for x86."
Diffstat (limited to 'scripts/symbol.py')
| -rwxr-xr-x | scripts/symbol.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/symbol.py b/scripts/symbol.py index 0c97ea1c1..5669b9db2 100755 --- a/scripts/symbol.py +++ b/scripts/symbol.py @@ -62,12 +62,15 @@ def FindToolchain(): if TOOLCHAIN is not None: return TOOLCHAIN - # We use slightly different names from GCC. + # We use slightly different names from GCC, and there's only one toolchain + # for x86/x86_64. gcc_arch = ARCH if gcc_arch == "arm64": gcc_arch = "aarch64" elif gcc_arch == "mips": gcc_arch = "mipsel" + elif gcc_arch == "x86": + gcc_arch = "x86_64" tc1 = os.environ["ANDROID_TOOLCHAIN"] tc2 = os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] |