oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

android/build.py: drop LLVM version from path 

For Android NDK r13.
This commit is contained in:
Max Kellermann 2016-10-26 11:12:32 +02:00
parent 4bbc43d91a
commit c776bcc5f6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/build.py
View File

@ -50,7 +50,6 @@ class AndroidNdkToolchain:
# select the NDK compiler # select the NDK compiler
gcc_version = '4.9' gcc_version = '4.9'
llvm_version = '3.6'
ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform) ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
sysroot = os.path.join(ndk_platform_path, 'arch-' + self.ndk_arch) sysroot = os.path.join(ndk_platform_path, 'arch-' + self.ndk_arch)
@ -62,7 +61,7 @@ class AndroidNdkToolchain:
self.sysroot = sysroot self.sysroot = sysroot
toolchain_path = os.path.join(ndk_path, 'toolchains', arch + '-' + gcc_version, 'prebuilt', build_arch) 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' llvm_triple = 'armv7-none-linux-androideabi'
common_flags = '-march=armv7-a -mfloat-abi=softfp' common_flags = '-march=armv7-a -mfloat-abi=softfp'