Skip to content

M
mpd
Commit f24ab120 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

android/build.py: use -fpic instead of -fPIC on ARM/Aarch64

Sync with the Android NDK build scripts.
parent 68349bc5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
android/build.py
View file @ f24ab120
...@@ -26,7 +26,7 @@ android_abis = { ...@@ -26,7 +26,7 @@ android_abis = {
'ndk_arch': 'arm', 'ndk_arch': 'arm',
'toolchain_arch': 'arm-linux-androideabi', 'toolchain_arch': 'arm-linux-androideabi',
'llvm_triple': 'armv7-linux-androideabi', 'llvm_triple': 'armv7-linux-androideabi',
'cflags': '-march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp', 'cflags': '-fpic -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp',
}, },
'arm64-v8a': { 'arm64-v8a': {
...@@ -34,7 +34,7 @@ android_abis = { ...@@ -34,7 +34,7 @@ android_abis = {
'ndk_arch': 'arm64', 'ndk_arch': 'arm64',
'toolchain_arch': 'aarch64-linux-android', 'toolchain_arch': 'aarch64-linux-android',
'llvm_triple': 'aarch64-linux-android', 'llvm_triple': 'aarch64-linux-android',
'cflags': '', 'cflags': '-fpic',
}, },
'x86': { 'x86': {
...@@ -42,7 +42,7 @@ android_abis = { ...@@ -42,7 +42,7 @@ android_abis = {
'ndk_arch': 'x86', 'ndk_arch': 'x86',
'toolchain_arch': 'x86', 'toolchain_arch': 'x86',
'llvm_triple': 'i686-linux-android', 'llvm_triple': 'i686-linux-android',
'cflags': '-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32', 'cflags': '-fPIC -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32',
}, },
'x86_64': { 'x86_64': {
...@@ -50,7 +50,7 @@ android_abis = { ...@@ -50,7 +50,7 @@ android_abis = {
'ndk_arch': 'x86_64', 'ndk_arch': 'x86_64',
'toolchain_arch': 'x86_64', 'toolchain_arch': 'x86_64',
'llvm_triple': 'x86_64-linux-android', 'llvm_triple': 'x86_64-linux-android',
'cflags': '-m64', 'cflags': '-fPIC -m64',
}, },
} }
...@@ -97,7 +97,6 @@ class AndroidNdkToolchain: ...@@ -97,7 +97,6 @@ class AndroidNdkToolchain:
llvm_triple = abi_info['llvm_triple'] + android_api_level llvm_triple = abi_info['llvm_triple'] + android_api_level
common_flags = '-Os -g' common_flags = '-Os -g'
common_flags += ' -fPIC'
common_flags += ' ' + abi_info['cflags'] common_flags += ' ' + abi_info['cflags']
toolchain_bin = os.path.join(toolchain_path, 'bin') toolchain_bin = os.path.join(toolchain_path, 'bin')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment