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

android/build.py: support the x86 ABI 

First commit for issue #69
This commit is contained in:
Max Kellermann 2018-03-04 20:46:46 +01:00
parent ea552208fc
commit 8266ab5588
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
android/build.py
View File

@ -24,9 +24,18 @@ android_abis = {
'armeabi-v7a': { 'armeabi-v7a': {
'arch': 'arm-linux-androideabi', 'arch': 'arm-linux-androideabi',
'ndk_arch': 'arm', 'ndk_arch': 'arm',
'toolchain_arch': 'arm-linux-androideabi',
'llvm_triple': 'armv7-none-linux-androideabi', 'llvm_triple': 'armv7-none-linux-androideabi',
'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp', 'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp',
}, },
'x86': {
'arch': 'i686-linux-android',
'ndk_arch': 'x86',
'toolchain_arch': 'x86',
'llvm_triple': 'i686-none-linux-android',
'cflags': '-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32',
},
} }
# select the NDK target # select the NDK target
@ -71,7 +80,7 @@ class AndroidNdkToolchain:
self.install_prefix = install_prefix self.install_prefix = install_prefix
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', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch)
llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch) llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
llvm_triple = abi_info['llvm_triple'] llvm_triple = abi_info['llvm_triple']

5
python/build/libs.py
View File

@ -23,6 +23,11 @@ libvorbis = AutotoolsProject(
[ [
'--disable-shared', '--enable-static', '--disable-shared', '--enable-static',
], ],
edits={
# this option is not understood by clang
'configure': lambda data: data.replace('-mno-ieee-fp', ' '),
}
) )
opus = AutotoolsProject( opus = AutotoolsProject(