updates after trying SDK 2.1

android/README.txt

@@ -1,29 +1,38 @@
-These instructions are for the 1.5 Android SDK.
+These instructions are for a recent Android SDK (1.6 or later)..
+Should also still work with a 1.5 SDK.
 The build file is not compatible with the 1.1 SDK any more.
-1.6 and 2.0 SDKs are untested.
 
+#Download the SDK from http://developer.android.com/sdk/index.html
 #Unzip the android SDK in ../../
-#So then the android tools will be in ../../android-sdk-linux_x86-1.5_r2/tools/
+#So then the android tools will be in ../../android-sdk-linux_86/tools/
+#
+# now go to the available packages tab, check the box and click refresh,
+# and download an SDK Platform
+# Since I2P is configured to run on 1.1 or higher
+# (API 2) download that one. Otherwise you must change the
+# target in default.properties from android-2 to andriod-x
+# where x is the API version.
 
 # create a file local.properties with the following line:
-# sdk-location=/path/to/your/android-sdk-linux_x86-1.5_r2
+# sdk-location=/path/to/your/android-sdk-linux_86
 
 #then build the android apk file:
 ant debug
 
-# Create the android 1.5 virtual device
+# Create the android 1.1 (API 2) virtual device
 # (don't make a custom hardware profile)
-../../android-sdk-linux_x86-1.5_r2/tools/android create avd --name i2p --target 2
+# A AVD created with the 1.5 SDK will not work with the newer tools
+../../android-sdk-linux_86/tools/android create avd --name i2p --target 2
 
 #then run the emulator:
-../../android-sdk-linux_x86-1.5_r2/tools/emulator -avd i2p &
+../../android-sdk-linux_86/tools/emulator -avd i2p &
 
 #then wait a couple minutes until the emulator is up
 #then install the I2P app
 ant install
 
 #then run the debugger
-../../android-sdk-linux_x86-1.5_r2/tools/ddms &
+../../android-sdk-linux_86/tools/ddms &
 
 #to rebuild and reinstall to emulator:
 ant reinstall

android/build.xml

@@ -113,6 +113,10 @@
         <delete file="${external-libs-folder}/crypto.jar" />
     </target>
 
+    <!-- fix for property name change sometime after SDK 1.5 -->
+    <property name="android-jar" value="${android.jar}" />
+    <property name="android-aidl" value="${android.aidl}" />
+
     <!--
          ================================================================================
          From here down copied from SDK platforms/android-1.1/templates/android_rules.xml

android/res/raw/router_config

@@ -10,7 +10,13 @@ i2np.udp.maxConnections=30
 # no I2CP
 i2p.dummyClientFacade=true
 # for now
-i2np.ntcp.enable=false
+#i2np.ntcp.enable=false
+#
+# UDP crashes the JVM, don't know why
+#
+i2np.udp.enable=false
+# no COMM at all!!!
+#i2p.vmCommSystem=true
 # not on android
 i2np.upnp.enable=false
 routerconsole.geoip.enable=false