first Android release
Finally, MPD runs on Android. For some small value of "runs". Very much work left, too much to describe.
This commit is contained in:
Max Kellermann
parent
9574d11dc8
commit
4dcf0b8ae0
52
Makefile.am
52
Makefile.am
|
|
@ -5,7 +5,10 @@ AM_CPPFLAGS += -I$(srcdir)/src $(GLIB_CFLAGS)
|
||||||
|
|
||||||
AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"'
|
AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"'
|
||||||
|
|
||||||
|
if ANDROID
|
||||||
|
else
|
||||||
bin_PROGRAMS = src/mpd
|
bin_PROGRAMS = src/mpd
|
||||||
|
endif
|
||||||
|
|
||||||
noinst_LIBRARIES = \
|
noinst_LIBRARIES = \
|
||||||
libmpd.a \
|
libmpd.a \
|
||||||
|
|
@ -24,6 +27,8 @@ noinst_LIBRARIES = \
|
||||||
libmixer_plugins.a \
|
libmixer_plugins.a \
|
||||||
liboutput_plugins.a
|
liboutput_plugins.a
|
||||||
|
|
||||||
|
libmpd_a_DEPENDENCIES =
|
||||||
|
|
||||||
libmpd_a_CPPFLAGS = $(AM_CPPFLAGS) \
|
libmpd_a_CPPFLAGS = $(AM_CPPFLAGS) \
|
||||||
$(LIBMPDCLIENT_CFLAGS) \
|
$(LIBMPDCLIENT_CFLAGS) \
|
||||||
$(AVAHI_CFLAGS) \
|
$(AVAHI_CFLAGS) \
|
||||||
|
|
@ -238,9 +243,50 @@ UPNP_SOURCES = \
|
||||||
#
|
#
|
||||||
|
|
||||||
if ANDROID
|
if ANDROID
|
||||||
all-local: libmpd.so
|
|
||||||
libmpd.so: $(filter %.a,$(src_mpd_LDADD))
|
noinst_LIBRARIES += libmain.a
|
||||||
$(AM_V_CXXLD)$(CXXLD) -Wl,-shared -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) $(src_mpd_LDADD) $(LIBS)
|
libmain_a_SOURCES = \
|
||||||
|
src/Main.cxx src/Main.hxx
|
||||||
|
libmain_a_CPPFLAGS = $(AM_CPPFLAGS) -Iandroid/build/include
|
||||||
|
|
||||||
|
all-local: android/build/bin/Main-debug.apk
|
||||||
|
clean-local:
|
||||||
|
rm -rf android/build
|
||||||
|
|
||||||
|
libmpd.so: $(filter %.a,$(src_mpd_LDADD)) libmain.a
|
||||||
|
$(AM_V_CXXLD)$(CXXLD) -shared -Wl,--no-undefined,-shared,-Bsymbolic -llog -lz -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) src/libmain_a-Main.o $(src_mpd_LDADD) $(LIBS)
|
||||||
|
|
||||||
|
android/build/build.xml: android/AndroidManifest.xml
|
||||||
|
rm -rf android/build
|
||||||
|
mkdir -p android/build/include
|
||||||
|
ln -s $(srcdir)/android/AndroidManifest.xml $(srcdir)/android/custom_rules.xml $(srcdir)/android/src $(srcdir)/android/res android/build
|
||||||
|
$(ANDROID_SDK)/tools/android update project --path android/build --target android-9
|
||||||
|
|
||||||
|
android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java android/build/build.xml
|
||||||
|
cd android/build && ant compile-jni-classes
|
||||||
|
|
||||||
|
android/build/include/org_musicpd_Bridge.h: android/build/bin/classes/org/musicpd/Bridge.class
|
||||||
|
javah -classpath $(ANDROID_SDK)/platforms/android-17/android.jar:android/build/bin/classes -d $(@D) org.musicpd.Bridge
|
||||||
|
|
||||||
|
libmpd_a_DEPENDENCIES += android/build/include/org_musicpd_Bridge.h
|
||||||
|
|
||||||
|
android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml
|
||||||
|
mkdir -p $(@D)
|
||||||
|
rm -f $@
|
||||||
|
strip -o $@ $<
|
||||||
|
|
||||||
|
android/build/bin/Main-debug.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so
|
||||||
|
cd android/build && ant nodeps debug
|
||||||
|
|
||||||
|
android/build/bin/Main-release-unsigned.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so
|
||||||
|
cd android/build && ant nodeps release
|
||||||
|
|
||||||
|
android/build/bin/Main-release-unaligned.apk: android/build/bin/Main-release-unsigned.apk
|
||||||
|
jarsigner -digestalg SHA1 -sigalg MD5withRSA -storepass:env ANDROID_KEYSTORE_PASS -keystore $(ANDROID_KEYSTORE) -signedjar $@ $< $(ANDROID_KEY_ALIAS)
|
||||||
|
|
||||||
|
android/build/bin/Main.apk: android/build/bin/Main-release-unaligned.apk
|
||||||
|
$(ANDROID_SDK)/tools/zipalign -f 4 $< $@
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
1
NEWS
1
NEWS
|
|
@ -34,6 +34,7 @@ ver 0.19 (not yet released)
|
||||||
* new resampler option using libsoxr
|
* new resampler option using libsoxr
|
||||||
* allow playlist directory without music directory
|
* allow playlist directory without music directory
|
||||||
* install systemd unit for socket activation
|
* install systemd unit for socket activation
|
||||||
|
* Android port
|
||||||
|
|
||||||
ver 0.18.9 (not yet released)
|
ver 0.18.9 (not yet released)
|
||||||
* decoder
|
* decoder
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
/build
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.musicpd"
|
||||||
|
android:installLocation="auto"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="0.19~git">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
|
||||||
|
|
||||||
|
<application android:icon="@drawable/icon" android:label="@string/app_name">
|
||||||
|
<activity android:name=".Main"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:launchMode="singleInstance">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
</application>
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||||
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||||
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
|
</manifest>
|
||||||
|
|
@ -0,0 +1,300 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
import os.path
|
||||||
|
import sys, shutil, subprocess
|
||||||
|
import urllib.request
|
||||||
|
import hashlib
|
||||||
|
import re
|
||||||
|
|
||||||
|
if len(sys.argv) < 3:
|
||||||
|
print("Usage: build.py SDK_PATH NDK_PATH [configure_args...]", file=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
sdk_path = sys.argv[1]
|
||||||
|
ndk_path = sys.argv[2]
|
||||||
|
configure_args = sys.argv[3:]
|
||||||
|
|
||||||
|
if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')):
|
||||||
|
print("SDK not found in", ndk_path, file=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if not os.path.isdir(ndk_path):
|
||||||
|
print("NDK not found in", ndk_path, file=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
# the path to the MPD sources
|
||||||
|
mpd_path = os.path.dirname(os.path.dirname(sys.argv[0]))
|
||||||
|
|
||||||
|
# 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')
|
||||||
|
|
||||||
|
# build host configuration
|
||||||
|
build_arch = 'linux-x86_64'
|
||||||
|
|
||||||
|
# redirect pkg-config to use our root directory instead of the default
|
||||||
|
# one on the build host
|
||||||
|
os.environ['PKG_CONFIG_LIBDIR'] = os.path.join(root_path, 'lib/pkgconfig')
|
||||||
|
|
||||||
|
# select the NDK compiler
|
||||||
|
gcc_version = '4.8'
|
||||||
|
llvm_version = '3.3'
|
||||||
|
|
||||||
|
# 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)
|
||||||
|
llvm_toolchain = os.path.join(ndk_path, 'toolchains', 'llvm-' + llvm_version, 'prebuilt', build_arch)
|
||||||
|
ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
|
||||||
|
target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)
|
||||||
|
|
||||||
|
llvm_triple = 'armv7-none-linux-androideabi'
|
||||||
|
|
||||||
|
def select_toolchain(use_cxx, use_clang):
|
||||||
|
global cc, cxx, ar, cflags, cxxflags, cppflags, ldflags, libs
|
||||||
|
|
||||||
|
target_arch = '-march=armv7-a -mfloat-abi=softfp'
|
||||||
|
if use_clang:
|
||||||
|
cc = os.path.join(llvm_toolchain, 'bin/clang')
|
||||||
|
cxx = os.path.join(llvm_toolchain, 'bin/clang++')
|
||||||
|
target_arch += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + gcc_toolchain
|
||||||
|
else:
|
||||||
|
cc = os.path.join(gcc_toolchain, 'bin', host_arch + '-gcc')
|
||||||
|
cxx = os.path.join(gcc_toolchain, 'bin', host_arch + '-g++')
|
||||||
|
ar = os.path.join(gcc_toolchain, 'bin', host_arch + '-ar')
|
||||||
|
|
||||||
|
libstdcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/gnu-libstdc++', gcc_version)
|
||||||
|
libstdcxx_cppflags = '-isystem ' + os.path.join(libstdcxx_path, 'include') + ' -isystem ' + os.path.join(libstdcxx_path, 'libs', android_abi, 'include')
|
||||||
|
if use_clang:
|
||||||
|
libstdcxx_cppflags += ' -D__STRICT_ANSI__'
|
||||||
|
libstdcxx_ldadd = os.path.join(libstdcxx_path, 'libs', android_abi, 'libgnustl_static.a')
|
||||||
|
|
||||||
|
cflags = '-Os -g ' + target_arch
|
||||||
|
cxxflags = '-Os -g ' + target_arch
|
||||||
|
cppflags = '--sysroot=' + target_root
|
||||||
|
ldflags = '--sysroot=' + target_root
|
||||||
|
libs = ''
|
||||||
|
|
||||||
|
if use_cxx:
|
||||||
|
libs += ' ' + libstdcxx_ldadd
|
||||||
|
cppflags += ' ' + libstdcxx_cppflags
|
||||||
|
|
||||||
|
def file_md5(path):
|
||||||
|
"""Calculate the MD5 checksum of a file and return it in hexadecimal notation."""
|
||||||
|
|
||||||
|
with open(path, 'rb') as f:
|
||||||
|
m = hashlib.md5()
|
||||||
|
while True:
|
||||||
|
data = f.read(65536)
|
||||||
|
if len(data) == 0:
|
||||||
|
# end of file
|
||||||
|
return m.hexdigest()
|
||||||
|
m.update(data)
|
||||||
|
|
||||||
|
def download_tarball(url, md5):
|
||||||
|
"""Download a tarball, verify its MD5 checksum and return the local path."""
|
||||||
|
|
||||||
|
global tarball_path
|
||||||
|
os.makedirs(tarball_path, exist_ok=True)
|
||||||
|
path = os.path.join(tarball_path, os.path.basename(url))
|
||||||
|
|
||||||
|
try:
|
||||||
|
calculated_md5 = file_md5(path)
|
||||||
|
if md5 == calculated_md5: return path
|
||||||
|
os.unlink(path)
|
||||||
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
tmp_path = path + '.tmp'
|
||||||
|
|
||||||
|
print("download", url)
|
||||||
|
urllib.request.urlretrieve(url, tmp_path)
|
||||||
|
calculated_md5 = file_md5(tmp_path)
|
||||||
|
if calculated_md5 != md5:
|
||||||
|
os.unlink(tmp_path)
|
||||||
|
raise "MD5 mismatch"
|
||||||
|
|
||||||
|
os.rename(tmp_path, path)
|
||||||
|
return path
|
||||||
|
|
||||||
|
class Project:
|
||||||
|
def __init__(self, url, md5, installed, name=None, version=None,
|
||||||
|
use_cxx=False, use_clang=False):
|
||||||
|
basename = os.path.basename(url)
|
||||||
|
m = re.match(r'^(.+)\.(tar(\.(gz|bz2|xz|lzma))?|zip)$', basename)
|
||||||
|
if not m: raise
|
||||||
|
self.base = m.group(1)
|
||||||
|
|
||||||
|
if name is None or version is None:
|
||||||
|
m = re.match(r'^([-\w]+)-(\d[\d.]*)$', self.base)
|
||||||
|
if name is None: name = m.group(1)
|
||||||
|
if version is None: version = m.group(2)
|
||||||
|
|
||||||
|
self.name = name
|
||||||
|
self.version = version
|
||||||
|
|
||||||
|
self.url = url
|
||||||
|
self.md5 = md5
|
||||||
|
self.installed = installed
|
||||||
|
|
||||||
|
self.use_cxx = use_cxx
|
||||||
|
self.use_clang = use_clang
|
||||||
|
|
||||||
|
def download(self):
|
||||||
|
return download_tarball(self.url, self.md5)
|
||||||
|
|
||||||
|
def is_installed(self):
|
||||||
|
global root_path
|
||||||
|
tarball = self.download()
|
||||||
|
installed = os.path.join(root_path, self.installed)
|
||||||
|
tarball_mtime = os.path.getmtime(tarball)
|
||||||
|
try:
|
||||||
|
return os.path.getmtime(installed) >= tarball_mtime
|
||||||
|
except FileNotFoundError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
def unpack(self):
|
||||||
|
global src_path
|
||||||
|
tarball = self.download()
|
||||||
|
path = os.path.join(src_path, self.base)
|
||||||
|
try:
|
||||||
|
shutil.rmtree(path)
|
||||||
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
|
os.makedirs(src_path, exist_ok=True)
|
||||||
|
subprocess.check_call(['/bin/tar', 'xfC', tarball, src_path])
|
||||||
|
return path
|
||||||
|
|
||||||
|
def make_build_path(self):
|
||||||
|
path = os.path.join(build_path, self.base)
|
||||||
|
try:
|
||||||
|
shutil.rmtree(path)
|
||||||
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
|
os.makedirs(path, exist_ok=True)
|
||||||
|
return path
|
||||||
|
|
||||||
|
class AutotoolsProject(Project):
|
||||||
|
def __init__(self, url, md5, installed, configure_args=[], **kwargs):
|
||||||
|
Project.__init__(self, url, md5, installed, **kwargs)
|
||||||
|
self.configure_args = configure_args
|
||||||
|
|
||||||
|
def build(self):
|
||||||
|
src = self.unpack()
|
||||||
|
build = self.make_build_path()
|
||||||
|
|
||||||
|
select_toolchain(use_cxx=self.use_cxx, use_clang=self.use_clang)
|
||||||
|
configure = [
|
||||||
|
os.path.join(src, 'configure'),
|
||||||
|
'CC=' + cc,
|
||||||
|
'CXX=' + cxx,
|
||||||
|
'CFLAGS=' + cflags,
|
||||||
|
'CXXFLAGS=' + cxxflags,
|
||||||
|
'CPPFLAGS=' + cppflags,
|
||||||
|
'LDFLAGS=' + ldflags,
|
||||||
|
'LIBS=' + libs,
|
||||||
|
'AR=' + ar,
|
||||||
|
'--host=' + host_arch,
|
||||||
|
'--prefix=' + root_path,
|
||||||
|
'--with-sysroot=' + target_root,
|
||||||
|
'--enable-silent-rules',
|
||||||
|
] + self.configure_args
|
||||||
|
|
||||||
|
subprocess.check_call(configure, cwd=build)
|
||||||
|
subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build)
|
||||||
|
subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build)
|
||||||
|
|
||||||
|
# a list of third-party libraries to be used by MPD on Android
|
||||||
|
thirdparty_libs = [
|
||||||
|
AutotoolsProject(
|
||||||
|
'http://downloads.xiph.org/releases/ogg/libogg-1.3.1.tar.xz',
|
||||||
|
'ca25d8da0ddfc8c6cbbf78d847a209fe',
|
||||||
|
'lib/libogg.a',
|
||||||
|
['--disable-shared', '--enable-static'],
|
||||||
|
),
|
||||||
|
|
||||||
|
AutotoolsProject(
|
||||||
|
'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz',
|
||||||
|
'55f2288055e44754275a17c9a2497391',
|
||||||
|
'lib/libvorbis.a',
|
||||||
|
['--disable-shared', '--enable-static'],
|
||||||
|
),
|
||||||
|
|
||||||
|
AutotoolsProject(
|
||||||
|
'https://svn.xiph.org/releases/flac/flac-1.3.0.tar.xz',
|
||||||
|
'13b5c214cee8373464d3d65dee362cdd',
|
||||||
|
'lib/libFLAC.a',
|
||||||
|
[
|
||||||
|
'--disable-shared', '--enable-static',
|
||||||
|
'--disable-xmms-plugin', '--disable-cpplibs',
|
||||||
|
],
|
||||||
|
use_clang=True,
|
||||||
|
),
|
||||||
|
|
||||||
|
AutotoolsProject(
|
||||||
|
'http://curl.haxx.se/download/curl-7.35.0.tar.lzma',
|
||||||
|
'ad7d63864414c61246450dc5e2248c7b',
|
||||||
|
'lib/libcurl.a',
|
||||||
|
[
|
||||||
|
'--disable-shared', '--enable-static',
|
||||||
|
'--disable-debug',
|
||||||
|
'--enable-http',
|
||||||
|
'--enable-ipv6',
|
||||||
|
'--disable-ftp', '--disable-file',
|
||||||
|
'--disable-ldap', '--disable-ldaps',
|
||||||
|
'--disable-rtsp', '--disable-proxy', '--disable-dict', '--disable-telnet',
|
||||||
|
'--disable-tftp', '--disable-pop3', '--disable-imap', '--disable-smtp',
|
||||||
|
'--disable-gopher',
|
||||||
|
'--disable-manual',
|
||||||
|
'--disable-threaded-resolver', '--disable-verbose', '--disable-sspi',
|
||||||
|
'--disable-crypto-auth', '--disable-ntlm-wb', '--disable-tls-srp', '--disable-cookies',
|
||||||
|
'--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2',
|
||||||
|
],
|
||||||
|
use_clang=True,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
# build the third-party libraries
|
||||||
|
for x in thirdparty_libs:
|
||||||
|
if not x.is_installed():
|
||||||
|
x.build()
|
||||||
|
|
||||||
|
# configure and build MPD
|
||||||
|
select_toolchain(use_cxx=True, use_clang=True)
|
||||||
|
|
||||||
|
configure = [
|
||||||
|
os.path.join(mpd_path, 'configure'),
|
||||||
|
'CC=' + cc,
|
||||||
|
'CXX=' + cxx,
|
||||||
|
'CFLAGS=' + cflags,
|
||||||
|
'CXXFLAGS=' + cxxflags,
|
||||||
|
'CPPFLAGS=' + cppflags,
|
||||||
|
'LDFLAGS=' + ldflags,
|
||||||
|
'LIBS=' + libs,
|
||||||
|
'AR=' + ar,
|
||||||
|
'--host=' + host_arch,
|
||||||
|
'--prefix=' + root_path,
|
||||||
|
'--with-sysroot=' + target_root,
|
||||||
|
'--with-android-sdk=' + sdk_path,
|
||||||
|
|
||||||
|
'--enable-silent-rules',
|
||||||
|
|
||||||
|
'--disable-glib',
|
||||||
|
|
||||||
|
# disabled for now because these features require GLib:
|
||||||
|
'--disable-database',
|
||||||
|
'--disable-httpd-output',
|
||||||
|
'--disable-vorbis-encoder',
|
||||||
|
|
||||||
|
] + configure_args
|
||||||
|
|
||||||
|
subprocess.check_call(configure)
|
||||||
|
subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'])
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<project name="mpd_rules">
|
||||||
|
<!-- setting these two properties works around a bug in Android
|
||||||
|
SDK's build.xml, which deletes all .class files every time -->
|
||||||
|
<property name="build.last.is.packaging.debug" value="true" />
|
||||||
|
<property name="build.is.packaging.debug" value="true" />
|
||||||
|
|
||||||
|
<target name="compile-jni-classes"
|
||||||
|
depends="-set-debug-mode,-compile"/>
|
||||||
|
</project>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<resources>
|
||||||
|
<string name="app_name">MPD</string>
|
||||||
|
</resources>
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.musicpd;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bridge to native code.
|
||||||
|
*/
|
||||||
|
public class Bridge {
|
||||||
|
public static native void run();
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.musicpd;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
public class Loader {
|
||||||
|
private static final String TAG = "MPD";
|
||||||
|
|
||||||
|
public static boolean loaded = false;
|
||||||
|
public static String error;
|
||||||
|
|
||||||
|
static {
|
||||||
|
try {
|
||||||
|
System.loadLibrary("mpd");
|
||||||
|
loaded = true;
|
||||||
|
} catch (UnsatisfiedLinkError e) {
|
||||||
|
Log.e(TAG, e.getMessage());
|
||||||
|
error = e.getMessage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,62 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.musicpd;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
public class Main extends Activity implements Runnable {
|
||||||
|
private static final String TAG = "MPD";
|
||||||
|
|
||||||
|
Thread thread;
|
||||||
|
|
||||||
|
@Override protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
if (!Loader.loaded) {
|
||||||
|
TextView tv = new TextView(this);
|
||||||
|
tv.setText("Failed to load the native MPD libary.\n" +
|
||||||
|
"Report this problem to us, and include the following information:\n" +
|
||||||
|
"ABI=" + Build.CPU_ABI + "\n" +
|
||||||
|
"PRODUCT=" + Build.PRODUCT + "\n" +
|
||||||
|
"FINGERPRINT=" + Build.FINGERPRINT + "\n" +
|
||||||
|
"error=" + Loader.error);
|
||||||
|
setContentView(tv);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (thread == null || !thread.isAlive()) {
|
||||||
|
thread = new Thread(this, "NativeMain");
|
||||||
|
thread.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
TextView tv = new TextView(this);
|
||||||
|
tv.setText("Music Player Daemon is running"
|
||||||
|
+ "\nCAUTION: this version is EXPERIMENTAL!");
|
||||||
|
setContentView(tv);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void run() {
|
||||||
|
Bridge.run();
|
||||||
|
}
|
||||||
|
}
|
||||||
21
configure.ac
21
configure.ac
|
|
@ -152,6 +152,27 @@ if test -z "$prefix" || test "x$prefix" = xNONE; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl Android
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
AC_ARG_WITH([android-sdk],
|
||||||
|
AS_HELP_STRING([--with-android-sdk=DIR],
|
||||||
|
[Directory for Android SDK]),
|
||||||
|
[], [with_android_sdk=no])
|
||||||
|
|
||||||
|
if test x$host_is_android = xyes; then
|
||||||
|
if test x$with_android_sdk = xno; then
|
||||||
|
AC_MSG_ERROR([Android build requires option --with-android-sdk=DIR])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -x $with_android_sdk/tools/android; then
|
||||||
|
AC_MSG_ERROR([Android SDK not found in $with_android_sdk])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(ANDROID_SDK, [$with_android_sdk])
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl Language Checks
|
dnl Language Checks
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
|
||||||
19
src/Main.cxx
19
src/Main.cxx
|
|
@ -88,6 +88,10 @@
|
||||||
#include "archive/ArchiveList.hxx"
|
#include "archive/ArchiveList.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef ANDROID
|
||||||
|
#include "org_musicpd_Bridge.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_GLIB
|
#ifdef HAVE_GLIB
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -365,6 +369,8 @@ shutdown_event_emitted(void)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef ANDROID
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
|
@ -374,6 +380,8 @@ int main(int argc, char *argv[])
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
int mpd_main(int argc, char *argv[])
|
int mpd_main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
struct options options;
|
struct options options;
|
||||||
|
|
@ -646,3 +654,14 @@ int mpd_main(int argc, char *argv[])
|
||||||
log_deinit();
|
log_deinit();
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ANDROID
|
||||||
|
|
||||||
|
gcc_visibility_default
|
||||||
|
JNIEXPORT void JNICALL
|
||||||
|
Java_org_musicpd_Bridge_run(JNIEnv *, jclass)
|
||||||
|
{
|
||||||
|
mpd_main(0, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue