aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-01-26 20:57:29 +0100
committerMax Kellermann <max@duempel.org>2015-01-26 20:57:29 +0100
commitae7e1a22cb3bc6029a6f270c3a68a139dfa86085 (patch)
treee4c11d3d2f125222b498005fcb6365ea94e53f9b /android
parent16944b53973cb52f343eda947262bf7a968b1953 (diff)
parenta289dcb9ee6d7992a21f24b99be667eed6c32321 (diff)
downloadmpd-ae7e1a22cb3bc6029a6f270c3a68a139dfa86085.tar.gz
mpd-ae7e1a22cb3bc6029a6f270c3a68a139dfa86085.tar.xz
mpd-ae7e1a22cb3bc6029a6f270c3a68a139dfa86085.zip
Merge branch 'v0.19.x'
Diffstat (limited to 'android')
-rw-r--r--android/AndroidManifest.xml4
-rwxr-xr-xandroid/build.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index a1e045e26..208c6e1ae 100644
--- a/android/AndroidManifest.xml
+++ b/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"/>
diff --git a/android/build.py b/android/build.py
index 635fef5eb..ad4b93944 100755
--- a/android/build.py
+++ b/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')