From bd0b8a1953b12bcabdf15f9c7a3c049fa7c71969 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Thu, 26 Dec 2013 20:44:35 -0500
Subject: [PATCH] [android] updated README file, added project/sdk.paths file

---
 Makefile.am               |  1 +
 android/README            | 35 +++++++++++++++++++++++++++++++++++
 android/project/sdk.paths |  3 +++
 3 files changed, 39 insertions(+)
 create mode 100644 android/project/sdk.paths

diff --git a/Makefile.am b/Makefile.am
index 3bf1ddd9..f2985771 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = \
     android/README \
     android/project/src/com/max2idea/android/fwknop/Fwknop.java \
     android/project/project.properties \
+    android/project/sdk.paths \
     android/project/ant.properties \
     android/project/build.xml \
     android/project/custom_rules.xml \
diff --git a/android/README b/android/README
index 6e657982..4380fabc 100644
--- a/android/README
+++ b/android/README
@@ -6,6 +6,41 @@ Max Kastanas <max2idea@users.sourceforge.net>
 Based on fwknop C implementation by Damien Stuart
 ===============================================================================
 
+- For those that are interested in Android development for the fwknop project,
+the ./project/sdk.paths file is meant to provide JAVE_HOME and PATH definitions
+for the local JVM and the Android SDK and NDK installations.  The general work
+flow is to first update the paths in in the sdk.paths file to point to the
+correct directories on your system, and you will also need to similarly update
+the sdk.dir and ndk.dir paths in the ./android/project/ant.properties file.
+Then:
+
+$ source ./project/sdk.paths
+
+- Then, start up the Android SDK:
+
+$ android &
+
+- Now, make updates to the fwknop/android/project/ files if implementing new
+functionality or fixing bugs.  Then, with an Android emulator running:
+
+$ cd ./project
+$ ant clean
+$ ant debug
+$ adb install -r bin/fwknop-android-debug.apk
+
+ - or -
+
+$ cd ./project
+$ ant clean
+$ ant release
+$ adb install bin/fwknop-android-release-unsigned.apk
+
+- With the new Android app installed now in the emulator, you can fire it up
+and use it to send SPA packets.
+
+
+### Legacy instructions follow: ###
+
 1. Requirements:
 
     a. Apache Ant (1.7.1)
diff --git a/android/project/sdk.paths b/android/project/sdk.paths
new file mode 100644
index 00000000..cf0b8469
--- /dev/null
+++ b/android/project/sdk.paths
@@ -0,0 +1,3 @@
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64
+
+export PATH=$PATH:/usr/lib/jvm/java-6-openjdk-amd64/bin:/home/mbr/android/android-sdk-linux/tools:/home/mbr/android/android-sdk-linux/platform-tools:/home/mbr/android/android-ndk-rb9