Merge branch 'v0.19.x'

android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="12"
-          android:versionName="0.19.8">
+          android:versionCode="13"
+          android:versionName="0.19.9">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
 

android/build.py

@@ -33,7 +33,7 @@ gcc_version = '4.9'
 llvm_version = '3.5'
 
 # the path to the MPD sources
-mpd_path = os.path.dirname(os.path.dirname(sys.argv[0])) or '.'
+mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..'))
 
 # output directories
 lib_path = os.path.abspath('lib')