diff options
Diffstat (limited to 'android')
| -rwxr-xr-x | android/build.py | 30 | ||||
| -rw-r--r-- | android/src/Bridge.java | 2 | ||||
| -rw-r--r-- | android/src/Loader.java | 2 | ||||
| -rw-r--r-- | android/src/Main.java | 2 |
4 files changed, 16 insertions, 20 deletions
diff --git a/android/build.py b/android/build.py index 351e881cf..ad4b93944 100755 --- a/android/build.py +++ b/android/build.py @@ -22,6 +22,16 @@ if not os.path.isdir(ndk_path): print("NDK not found in", ndk_path, file=sys.stderr) sys.exit(1) +# select the NDK target +ndk_arch = 'arm' +host_arch = 'arm-linux-androideabi' +android_abi = 'armeabi-v7a' +ndk_platform = 'android-14' + +# select the NDK compiler +gcc_version = '4.9' +llvm_version = '3.5' + # the path to the MPD sources mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..')) @@ -29,8 +39,9 @@ mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '.. lib_path = os.path.abspath('lib') tarball_path = lib_path src_path = os.path.join(lib_path, 'src') -build_path = os.path.join(lib_path, 'build') -root_path = os.path.join(lib_path, 'root') +arch_path = os.path.join(lib_path, host_arch) +build_path = os.path.join(arch_path, 'build') +root_path = os.path.join(arch_path, 'root') # build host configuration build_arch = 'linux-x86_64' @@ -39,16 +50,6 @@ build_arch = 'linux-x86_64' # one on the build host os.environ['PKG_CONFIG_LIBDIR'] = os.path.join(root_path, 'lib/pkgconfig') -# select the NDK compiler -gcc_version = '4.9' -llvm_version = '3.5' - -# select the NDK target -ndk_arch = 'arm' -host_arch = 'arm-linux-androideabi' -android_abi = 'armeabi-v7a' -ndk_platform = 'android-14' - # set up the NDK toolchain gcc_toolchain = os.path.join(ndk_path, 'toolchains', host_arch + '-' + gcc_version, 'prebuilt', build_arch) @@ -349,7 +350,6 @@ thirdparty_libs = [ '--enable-gpl', '--enable-small', '--disable-pthreads', - '--disable-runtime-cpudetect', '--disable-programs', '--disable-doc', '--disable-avdevice', @@ -423,10 +423,6 @@ configure = [ '--disable-glib', '--disable-icu', - # disabled for now because these features require GLib: - '--disable-httpd-output', - '--disable-vorbis-encoder', - ] + configure_args subprocess.check_call(configure) diff --git a/android/src/Bridge.java b/android/src/Bridge.java index 537343b56..4faf706bb 100644 --- a/android/src/Bridge.java +++ b/android/src/Bridge.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2014 The Music Player Daemon Project + * Copyright (C) 2003-2015 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify diff --git a/android/src/Loader.java b/android/src/Loader.java index fdaa27753..75d4857a3 100644 --- a/android/src/Loader.java +++ b/android/src/Loader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2014 The Music Player Daemon Project + * Copyright (C) 2003-2015 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify diff --git a/android/src/Main.java b/android/src/Main.java index d87f7709b..a4d81ba74 100644 --- a/android/src/Main.java +++ b/android/src/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2014 The Music Player Daemon Project + * Copyright (C) 2003-2015 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify |