From 16cc857a8b84c9baaceda67fbc0535ce14c6bcaf Mon Sep 17 00:00:00 2001
From: Vilbrekin <vilbrekin@gmail.com>
Date: Mon, 24 Nov 2014 00:55:05 +0100
Subject: [PATCH] Android Lollipop compatibility. Target Android 4.1+, building
 PIE executables. Fixes #26.

---
 AndroidManifest.xml |   8 ++++----
 jni/Application.mk  |   2 +-
 libs/armeabi/tincd  | Bin 452824 -> 452824 bytes
 libs/mips/tincd     | Bin 965408 -> 965408 bytes
 libs/x86/tincd      | Bin 785232 -> 785232 bytes
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 24ae0d3..55ce739 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="org.poirsouille.tinc_gui"
-    android:versionCode="12"
-    android:versionName="0.9.11" >
+    android:versionCode="13"
+    android:versionName="0.9.12" >
 
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -40,4 +40,4 @@
 		</receiver>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/jni/Application.mk b/jni/Application.mk
index 1a770bd..93a55ed 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -2,4 +2,4 @@ APP_MODULES := tincd
 APP_ABI := armeabi x86 mips
 #NDK_TOOLCHAIN_VERSION=4.8
 APP_PIE = false
-APP_PLATFORM := android-10
+APP_PLATFORM := android-16
diff --git a/libs/armeabi/tincd b/libs/armeabi/tincd
index f995150069757da8f5c93010c0c58ddb4d121465..d7303f365b2739c621697e4ec81b9bb96c7e4262 100755
GIT binary patch
delta 56
zcmV-80LTB>(Hq#&8-RoXgaU*Ev;_E*0T8$OlLRDM6i#n;ATl%{GB7bT05C8*H8MIe
OIfpUs1h+Bn1*iI3ZWJ>B

delta 56
zcmV-80LTB>(Hq#&8-RoXgaU*Ev;_E*0SUMHlLRDM6iRh&ATl!`GB7bT05CH;F*rIj
OFo!Yj1h+Bn1*iI1trR2x

diff --git a/libs/mips/tincd b/libs/mips/tincd
index e52622dd634c35f911024545391d3fda9086ef11..4cc8c11aef883e121f4b87b03a13bfbd54ac5b74 100755
GIT binary patch
delta 67
zcmZ4R&1%6ntA-ZF7N!>F7M2#)7Pc1l7LFFqEnGaug#Gf%6pTz1j0_A-7z_-oOpUD!
U+U1XN0Wmia^K6$t#>@B>0Q>Y6r2qf`

delta 67
zcmZ4R&1%6ntA-ZF7N!>F7M2#)7Pc1l7LFFqEnGauguP1h6pV}&j0_A-7z~W93@xlo
U+U1XN0Wmia^K6$t#>@B>0Q;pCrT_o{

diff --git a/libs/x86/tincd b/libs/x86/tincd
index 0e540983032b8458c112d42877358b9eafaeb7f7..48b9f7f0a74e0cb60fbf6faa7e55766e8024716f 100755
GIT binary patch
delta 66
zcmcccP5;6-{e~9C7N!>F7M2#)7Pc1lEgTXP83ndWPUPrf=QFS}HL@}>V(`l^Q!p}V
T-#CK<h&h3nYx~9--1CzF3gQ=H

delta 66
zcmcccP5;6-{e~9C7N!>F7M2#)7Pc1lEgTXP89BF0PUPrf=QFl4w6HQUV(==>Q!p}a
T-#CK<h&h3nYx~9--1CzF3C9;%