6 Commits
Author SHA1 Message Date
Tijmen Wildervanck 6986f3eaaa update Gradle and Buildtools and fix YML 2017-10-13 23:38:16 +02:00
Tijmen Wildervanck b5cb91721f Fix a double header definition on newer NDK versions.
Newer Android NDK versions (>21) have  APRA Nameser_compat.h, which causes a double struct definition. This patch checks if APRA nameser.h includes APRA nameser_compat.h and if that is the case, it disables android_dns.h.
2017-10-13 23:38:16 +02:00
Tijmen Wildervanck a4688cdeed update md5 path 2017-10-13 23:26:13 +02:00
Tijmen Wildervanck 327aa66e61 fix line breaks and add a download link 2017-10-13 23:26:13 +02:00
Tijmen Wildervanck 024b1207ed Fix typo in the logo url of readme.md 2017-10-13 23:26:13 +02:00
Yves Fischer f193176c08 Improve README file 2016-12-01 23:38:42 +01:00
5 changed files with 18 additions and 13 deletions

No files matched your search

+2 -2
View File
@@ -5,8 +5,8 @@ jdk:
android:
components:
- build-tools-21.1.2
- android-15
- build-tools-25.0.2
- android-21
before_install:
- git clone --depth 1 https://github.com/urho3d/android-ndk.git $HOME/android-ndk-root
+8 -6
View File
@@ -1,7 +1,8 @@
![Logo](src/main/res/drawabe/logo.png)
![Logo](src/main/res/drawable/logo.png)
This is a port of iodine (http://code.kryo.se/iodine/) to the Android VPN Framework.
It doesn't require "root" on the phone.
It doesn't require "root" on the phone.
Downloads are available on [F-droid](https://f-droid.org/packages/org.xapek.andiodine/).
# Documentation
@@ -13,17 +14,18 @@ The following two documents exist in German language only:
Requires the Android SDK and NDK to be installed.
``` bash
```
bash
./gradlew build
```
Then find the APK files in folder `build/outputs/apk/`
# Authors and License
Android Iodine Copyright (c) 2016 Yves Fischer <yvesf+andiodine@xapek.org> and contributors
Android Iodine Copyright (c) 2016 Yves Fischer <yvesf+andiodine@xapek.org> and contributors.
Same license as iodine.
Iodine Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
Iodine Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
Also major contributions by Anne Bezemer.
Permission to use, copy, modify, and distribute this software for any purpose
@@ -39,5 +41,5 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
MD5 implementation by L. Peter Deutsch (license and source in src/md5.[ch])
MD5 implementation by L. Peter Deutsch (license and source in jni/iodine/src/md5.[ch])
Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
+2 -2
View File
@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}
@@ -12,7 +12,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion '25.0.2'
sourceSets.main {
jniLibs.srcDir 'libs'
+2 -2
View File
@@ -1,6 +1,6 @@
#Mon Nov 21 21:42:02 GMT 2016
#Fri Oct 13 18:56:29 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+4 -1
View File
@@ -1,6 +1,8 @@
#ifndef __FIX_ANDROID_H__
#define __FIX_ANDROID_H__
#include <arpa/nameser.h>
#ifndef _ARPA_NAMESER_COMPAT_
typedef struct {
unsigned id :16;
@@ -36,4 +38,5 @@ typedef struct {
#define T_TXT 16
#define T_SRV 33
#endif
#endif //_ARPA_NAMESER_COMPAT_
#endif //__FIX_ANDROID_H__