Skip to content

Commit

Permalink
Android Lollipop compatibility.
Browse files Browse the repository at this point in the history
Target Android 4.1+, building PIE executables.
Fixes #26.
  • Loading branch information
Vilbrekin committed Nov 23, 2014
1 parent 2e22114 commit 16cc857
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down Expand Up @@ -40,4 +40,4 @@
</receiver>
</application>

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion jni/Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified libs/armeabi/tincd
Binary file not shown.
Binary file modified libs/mips/tincd
Binary file not shown.
Binary file modified libs/x86/tincd
Binary file not shown.

0 comments on commit 16cc857

Please sign in to comment.