From a2af158fd33631d201c9a519911e82ff0a47a923 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 16 Jan 2015 17:26:50 +0100
Subject: configure.ac: prepare for 0.19.9

---
 android/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'android')

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"/>
 
-- 
cgit v1.2.3


From 212b0faf0c370968b475dbc7725e89ab2dcfb900 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 22 Jan 2015 18:51:53 +0100
Subject: android/build.py: use os.path.abspath() to build mpd_path

Fixes a bug that occurs when runing "build.py" from inside the
"android" directory.
---
 android/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'android')

diff --git a/android/build.py b/android/build.py
index 751fce167..351e881cf 100755
--- a/android/build.py
+++ b/android/build.py
@@ -23,7 +23,7 @@ if not os.path.isdir(ndk_path):
     sys.exit(1)
 
 # 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')
-- 
cgit v1.2.3