diff options
| -rwxr-xr-x | android/build.py | 11 | ||||
| -rw-r--r-- | python/build/libs.py | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/android/build.py b/android/build.py index 02b426119..19dcbaee7 100755 --- a/android/build.py +++ b/android/build.py @@ -24,9 +24,18 @@ android_abis = { 'armeabi-v7a': { 'arch': 'arm-linux-androideabi', 'ndk_arch': 'arm', + 'toolchain_arch': 'arm-linux-androideabi', 'llvm_triple': 'armv7-none-linux-androideabi', '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 @@ -71,7 +80,7 @@ class AndroidNdkToolchain: self.install_prefix = install_prefix 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_triple = abi_info['llvm_triple'] diff --git a/python/build/libs.py b/python/build/libs.py index 4cbab63ee..18b4cbbaf 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -23,6 +23,11 @@ libvorbis = AutotoolsProject( [ '--disable-shared', '--enable-static', ], + + edits={ + # this option is not understood by clang + 'configure': lambda data: data.replace('-mno-ieee-fp', ' '), + } ) opus = AutotoolsProject( |