simpleperf: move to llvm binutils.

Bug: none
Test: run test.py TestTools*.
Change-Id: I9fcbb559ea4cb52e1ac79f3a7aa801a1d7e94dce

diff --git a/simpleperf/scripts/utils.py b/simpleperf/scripts/utils.py
index 0db571a..85c0029 100644 (file)
--- a/simpleperf/scripts/utils.py
+++ b/simpleperf/scripts/utils.py
@@ -172,16 +172,16 @@ def _get_binutils_path_in_ndk(toolname, arch, platform):
         arch = 'arm64'
     if arch == 'arm64':
         name = 'aarch64-linux-android-' + toolname
-        path = 'toolchains/aarch64-linux-android-4.9/prebuilt/%s-x86_64/bin/%s' % (platform, name)
+        path = 'toolchains/llvm/prebuilt/%s-x86_64/bin/%s' % (platform, name)
     elif arch == 'arm':
         name = 'arm-linux-androideabi-' + toolname
-        path = 'toolchains/arm-linux-androideabi-4.9/prebuilt/%s-x86_64/bin/%s' % (platform, name)
+        path = 'toolchains/llvm/prebuilt/%s-x86_64/bin/%s' % (platform, name)
     elif arch == 'x86_64':
         name = 'x86_64-linux-android-' + toolname
-        path = 'toolchains/x86_64-4.9/prebuilt/%s-x86_64/bin/%s' % (platform, name)
+        path = 'toolchains/llvm/prebuilt/%s-x86_64/bin/%s' % (platform, name)
     elif arch == 'x86':
         name = 'i686-linux-android-' + toolname
-        path = 'toolchains/x86-4.9/prebuilt/%s-x86_64/bin/%s' % (platform, name)
+        path = 'toolchains/llvm/prebuilt/%s-x86_64/bin/%s' % (platform, name)
     else:
         log_fatal('unexpected arch %s' % arch)
     return (name, path)