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

android/build.py: add ABI parameter

This commit is contained in:
Max Kellermann 2018-03-04 20:43:59 +01:00
parent e86015a72a
commit ea552208fc
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
android/build.py
View File

@ -3,13 +3,14 @@
import os, os.path import os, os.path
import sys, subprocess import sys, subprocess
if len(sys.argv) < 3: if len(sys.argv) < 4:
print("Usage: build.py SDK_PATH NDK_PATH [configure_args...]", file=sys.stderr) print("Usage: build.py SDK_PATH NDK_PATH ABI [configure_args...]", file=sys.stderr)
sys.exit(1) sys.exit(1)
sdk_path = sys.argv[1] sdk_path = sys.argv[1]
ndk_path = sys.argv[2] ndk_path = sys.argv[2]
configure_args = sys.argv[3:] android_abi = sys.argv[3]
configure_args = sys.argv[4:]
if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')): if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')):
print("SDK not found in", ndk_path, file=sys.stderr) print("SDK not found in", ndk_path, file=sys.stderr)
@ -19,8 +20,18 @@ if not os.path.isdir(ndk_path):
print("NDK not found in", ndk_path, file=sys.stderr) print("NDK not found in", ndk_path, file=sys.stderr)
sys.exit(1) sys.exit(1)
android_abis = {
'armeabi-v7a': {
'arch': 'arm-linux-androideabi',
'ndk_arch': 'arm',
'llvm_triple': 'armv7-none-linux-androideabi',
'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp',
},
}
# select the NDK target # select the NDK target
arch = 'arm-linux-androideabi' abi_info = android_abis[android_abi]
arch = abi_info['arch']
# the path to the MPD sources # the path to the MPD sources
mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..')) mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..'))
@ -44,8 +55,7 @@ class AndroidNdkToolchain:
self.src_path = src_path self.src_path = src_path
self.build_path = build_path self.build_path = build_path
ndk_arch = 'arm' ndk_arch = abi_info['ndk_arch']
android_abi = 'armeabi-v7a'
ndk_platform = 'android-14' ndk_platform = 'android-14'
# select the NDK compiler # select the NDK compiler
@ -63,11 +73,11 @@ class AndroidNdkToolchain:
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', 'prebuilt', build_arch) llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
llvm_triple = 'armv7-none-linux-androideabi' llvm_triple = abi_info['llvm_triple']
common_flags = '-Os -g' common_flags = '-Os -g'
common_flags += ' -fPIC' common_flags += ' -fPIC'
common_flags += ' -march=armv7-a -mfpu=vfp -mfloat-abi=softfp' common_flags += ' ' + abi_info['cflags']
toolchain_bin = os.path.join(toolchain_path, 'bin') toolchain_bin = os.path.join(toolchain_path, 'bin')
llvm_bin = os.path.join(llvm_path, 'bin') llvm_bin = os.path.join(llvm_path, 'bin')

9
doc/user.xml
View File

@ -303,9 +303,16 @@ apt-get install g++ \
<command>./configure</command>, type: <command>./configure</command>, type:
</para> </para>
<programlisting>./android/build.py SDK_PATH NDK_PATH <programlisting>./android/build.py SDK_PATH NDK_PATH ABI
make android/build/mpd-debug.apk</programlisting> make android/build/mpd-debug.apk</programlisting>
<para>
<varname>SDK_PATH</varname> is the absolute path where you
installed the Android SDK; <varname>NDK_PATH</varname> is
the Android NDK installation path; <varname>ABI</varname> is
the Android ABI to be built, e.g. "armeabi-v7a".
</para>
<para> <para>
This downloads various library sources, and then configures This downloads various library sources, and then configures
and builds <application>MPD</application>. and builds <application>MPD</application>.