summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2016-10-26 11:12:32 +0200
committerMax Kellermann <max@musicpd.org>2016-10-26 17:00:17 +0200
commitc776bcc5f6a5a22a9133d601296d4c8e9934a4c8 (patch)
treec05effbd43d224be479082afbc887855ba171069 /android
parent4bbc43d91af651a5a78c12e0cc6023df87deb299 (diff)
android/build.py: drop LLVM version from path
For Android NDK r13.
Diffstat (limited to 'android')
-rwxr-xr-xandroid/build.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/android/build.py b/android/build.py
index 4b720a69c..a699275e3 100755
--- a/android/build.py
+++ b/android/build.py
@@ -50,7 +50,6 @@ class AndroidNdkToolchain:
# select the NDK compiler
gcc_version = '4.9'
- llvm_version = '3.6'
ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
sysroot = os.path.join(ndk_platform_path, 'arch-' + self.ndk_arch)
@@ -62,7 +61,7 @@ class AndroidNdkToolchain:
self.sysroot = sysroot
toolchain_path = os.path.join(ndk_path, 'toolchains', arch + '-' + gcc_version, 'prebuilt', build_arch)
- llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm-' + llvm_version, 'prebuilt', build_arch)
+ llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
llvm_triple = 'armv7-none-linux-androideabi'
common_flags = '-march=armv7-a -mfloat-abi=softfp'