From c3166bec1cffd98b648fa163238f6424db3c27db Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 7 Jul 2014 15:06:28 -0700 Subject: Fix symbol.py's toolchain detection for x86. x86 uses the x86_64 toolchain. There's no separate 32-bit toolchain. I started to refactor so we could add FindToolchain tests, but that doesn't work because FindToolchain depends on environment variables set up by 'lunch'. Change-Id: I264b95e1e83a7e795f8cac49bc9e1cf497514029 --- scripts/symbol.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/symbol.py') 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"] -- cgit v1.2.3