Added android specific readme file, along with new make targets

Also updated changelog.
This commit is contained in:
Erik Ekman 2012-02-05 00:36:15 +01:00
parent 85be9b07d1
commit 423cbec41d
4 changed files with 70 additions and 4 deletions

View File

@ -35,6 +35,8 @@ CHANGES:
Patch by Hagar. Patch by Hagar.
- Add -R option to set OpenBSD routing domain for the DNS socket. - Add -R option to set OpenBSD routing domain for the DNS socket.
Patch by laurent at gouloum fr, fixes #95. Patch by laurent at gouloum fr, fixes #95.
- Add android patches and makefile, from Marcel Bokhorst, fixes #105.
- Added missing break in iodine.c, by Pavel Pergamenshchik, #108.
2009-06-01: 0.5.2 "WifiFree" 2009-06-01: 0.5.2 "WifiFree"
- Fixed client segfault on OS X, #57 - Fixed client segfault on OS X, #57

View File

@ -19,6 +19,24 @@ TARGETOS = `uname`
all: all:
@(cd src; $(MAKE) TARGETOS=$(TARGETOS) all) @(cd src; $(MAKE) TARGETOS=$(TARGETOS) all)
cross-android:
@(cd src; $(MAKE) base64u.c base64u.h)
@(cd src; ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk)
cross-android-dist:
@rm -rf iodine-latest-android*
@mkdir -p iodine-latest-android/armeabi iodine-latest-android/x86
@$(MAKE) cross-android TARGET_ARCH_ABI=armeabi
@cp src/libs/armeabi/* iodine-latest-android/armeabi
@$(MAKE) cross-android TARGET_ARCH_ABI=x86
@cp src/libs/x86/* iodine-latest-android/x86
@cp README README-android.txt CH* TO* iodine-latest-android
@echo "Create date: " > iodine-latest-android/VERSION
@date >> iodine-latest-android/VERSION
@echo "Git version: " >> iodine-latest-android/VERSION
@git rev-parse HEAD >> iodine-latest-android/VERSION
@zip -r iodine-latest-android.zip iodine-latest-android
cross-mingw: cross-mingw:
@(cd src; $(MAKE) TARGETOS=windows32 CC=i686-mingw32-gcc all) @(cd src; $(MAKE) TARGETOS=windows32 CC=i686-mingw32-gcc all)
@ -27,11 +45,11 @@ cross-mingw-dist: cross-mingw
@mkdir -p iodine-latest-win32/bin @mkdir -p iodine-latest-win32/bin
@for i in `ls bin`; do cp bin/$$i iodine-latest-win32/bin/$$i.exe; done @for i in `ls bin`; do cp bin/$$i iodine-latest-win32/bin/$$i.exe; done
@cp /usr/i686-mingw32/usr/bin/zlib1.dll iodine-latest-win32/bin @cp /usr/i686-mingw32/usr/bin/zlib1.dll iodine-latest-win32/bin
@cp README* CH* TO* iodine-latest-win32 @cp README README-win32.txt CH* TO* iodine-latest-win32
@echo "Create date: " > iodine-latest-win32/VERSION @echo "Create date: " > iodine-latest-win32/VERSION
@date >> iodine-latest-win32/VERSION @date >> iodine-latest-win32/VERSION
@echo "SVN version: " >> iodine-latest-win32/VERSION @echo "Git version: " >> iodine-latest-win32/VERSION
@svnversion >> iodine-latest-win32/VERSION @git rev-parse HEAD >> iodine-latest-win32/VERSION
@zip -r iodine-latest-win32.zip iodine-latest-win32 @zip -r iodine-latest-win32.zip iodine-latest-win32
install: all install: all
@ -58,5 +76,5 @@ clean:
@echo "Cleaning..." @echo "Cleaning..."
@(cd src; $(MAKE) clean) @(cd src; $(MAKE) clean)
@(cd tests; $(MAKE) clean) @(cd tests; $(MAKE) clean)
@rm -rf bin iodine-latest-win32* @rm -rf bin iodine-latest-win32* iodine-latest-android*

45
README-android.txt Normal file
View File

@ -0,0 +1,45 @@
iodine - http://code.kryo.se/iodine
***********************************
Extra README file for Android
== Running iodine on Android:
1. Get root access on your android device
2. Find/build a compatible tun.ko for your specific Android kernel
3. Copy tun.ko and the iodine binary to your device:
(Almost all devices need the armeabi binary. Only Intel powered
ones need the x86 build.)
adb push tun.ko /data/local/tmp
adb push iodine /data/local/tmp
adb shell
su
cd /data/local/tmp
chmod 777 iodine
4. Run iodine (see the man page for parameters)
./iodine ...
For more information: http://blog.bokhorst.biz/5123
== Building iodine for Android:
1. Download and install the Android SDK and NDK
2. Download and unpack the iodine sources
3. Build:
cd src
make base64u.h base64u.c
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk
or run "make cross-android" in the iodine root directory.
To build for other archs, specify TARGET_ARCH_ABI:
"make cross-android TARGET_ARCH_ABI=x86"

View File

@ -43,4 +43,5 @@ base64u.h: base64.h
clean: clean:
@echo "Cleaning src/" @echo "Cleaning src/"
@rm -f $(CLIENT){,.exe} $(SERVER){,.exe} *~ *.o *.core base64u.* @rm -f $(CLIENT){,.exe} $(SERVER){,.exe} *~ *.o *.core base64u.*
@rm -rf obj libs #android stuff