From 2d49949c8428724ac502a15285e22a3d0e5f0c51 Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Thu, 22 Oct 2015 17:53:34 +0200
Subject: [PATCH] OpenDelta: fix build for 6.0

Change-Id: I0d4d428c51fa6a4bcc96e793f088d3ae48daedc1
---
 Android.mk          | 1 +
 AndroidManifest.xml | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 06309fb..bf4dfeb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_SDK_VERSION := 21
 
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
 LOCAL_JNI_SHARED_LIBRARIES := libopendelta
 LOCAL_REQUIRED_MODULES := libopendelta
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5510096..67f23f6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,8 @@
 	android:versionCode="10"
 	android:versionName="1.0" >
 	<uses-sdk
-		android:minSdkVersion="21"
-		android:targetSdkVersion="21" />
+		android:minSdkVersion="23"
+		android:targetSdkVersion="23" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -24,6 +24,9 @@
 		android:allowBackup="false"
 		android:icon="@mipmap/ic_launcher_settings"
 		android:label="@string/app_name" >
+
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+
 		<activity
 			android:name="eu.chainfire.opendelta.MainActivity"
 			android:label="@string/title"