diff options
Diffstat (limited to '')
| -rwxr-xr-x | android/build.py | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/android/build.py b/android/build.py index 351e881cf..024651e8f 100755 --- a/android/build.py +++ b/android/build.py @@ -22,15 +22,31 @@ 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 '.', '..')) # output directories 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') + +shared_path = lib_path +if 'MPD_SHARED_LIB' in os.environ: + shared_path = os.environ['MPD_SHARED_LIB'] +tarball_path = os.path.join(shared_path, 'download') +src_path = os.path.join(shared_path, 'src') + +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 +55,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) @@ -299,8 +305,8 @@ thirdparty_libs = [ ), AutotoolsProject( - 'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz', - '55f2288055e44754275a17c9a2497391', + 'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz', + '28cb28097c07a735d6af56e598e1c90f', 'lib/libvorbis.a', ['--disable-shared', '--enable-static'], ), @@ -341,15 +347,14 @@ thirdparty_libs = [ ), FfmpegProject( - 'http://ffmpeg.org/releases/ffmpeg-2.5.tar.bz2', - '4346fe710cc6bdd981f6534d2420d1ab', + 'http://ffmpeg.org/releases/ffmpeg-2.6.2.tar.bz2', + 'e75d598921285d6775f20164a91936ac', 'lib/libavcodec.a', [ '--disable-shared', '--enable-static', '--enable-gpl', '--enable-small', '--disable-pthreads', - '--disable-runtime-cpudetect', '--disable-programs', '--disable-doc', '--disable-avdevice', @@ -366,8 +371,8 @@ thirdparty_libs = [ ), AutotoolsProject( - 'http://curl.haxx.se/download/curl-7.39.0.tar.lzma', - 'e9aa6dec29920eba8ef706ea5823bad7', + 'http://curl.haxx.se/download/curl-7.42.1.tar.lzma', + 'f1e460020a99da039b153e4bf0cd8600', 'lib/libcurl.a', [ '--disable-shared', '--enable-static', @@ -388,8 +393,8 @@ thirdparty_libs = [ ), BoostProject( - 'http://netcologne.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2', - 'd6eef4b4cacb2183f2bf265a5a03a354', + 'http://netcologne.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.bz2', + 'b8839650e61e9c1c0a89f371dd475546', 'include/boost/version.hpp', ), ] @@ -420,13 +425,8 @@ configure = [ '--enable-silent-rules', - '--disable-glib', '--disable-icu', - # disabled for now because these features require GLib: - '--disable-httpd-output', - '--disable-vorbis-encoder', - ] + configure_args subprocess.check_call(configure) |