Migrate to dynamically-loaded Android-specific classes

Requires i2p.i2p revision fc46f2d84625265a3899b5ad50af5e91d396ba01 or upcoming
release 0.9.26

app/src/main/java/net/i2p/router/client/DomainClientListenerRunner.java

@@ -0,0 +1,30 @@
+package net.i2p.router.client;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+import net.i2p.client.DomainSocketFactory;
+import net.i2p.router.RouterContext;
+
+/**
+ * Unix domain socket version of ClientListenerRunner.
+ *
+ * @author str4d
+ * @since 0.9.14
+ */
+public class DomainClientListenerRunner extends ClientListenerRunner {
+    private final DomainSocketFactory factory;
+
+    public DomainClientListenerRunner(RouterContext context, ClientManager manager) {
+        super(context, manager, -1);
+        factory = new DomainSocketFactory(_context);
+    }
+
+    /**
+     * @throws IOException
+     */
+    @Override
+    protected ServerSocket getServerSocket() throws IOException {
+        return factory.createServerSocket(DomainSocketFactory.I2CP_SOCKET_ADDRESS);
+    }
+}

lib/client/build.xml

@@ -28,13 +28,7 @@
         <mkdir dir="${jar.libs.dir}" />
 
         <!-- core -->
-        <!-- lots of unneeded stuff could be deleted here -->
-        <jar destfile="${jar.libs.dir}/i2p.jar" >
-            <zipfileset src="${i2plib}/i2p.jar" >
-                <exclude name="net/i2p/client/DomainSocketFactory.class" />
-                <exclude name="net/i2p/util/LogWriter.class" />
-            </zipfileset>
-        </jar>
+        <copy file="${i2plib}/i2p.jar" todir="${jar.libs.dir}" />
 
         <!-- streaming -->
         <copy file="${i2plib}/mstreaming.jar" todir="${jar.libs.dir}" />

lib/client/src/main/java/net/i2p/util/AndroidLogWriter.java

@@ -10,8 +10,8 @@ package net.i2p.util;
  *
  * @author zzz
  */
-class LogWriter extends LogWriterBase {
-    public LogWriter(LogManager manager) {
+class AndroidLogWriter extends LogWriter {
+    public AndroidLogWriter(LogManager manager) {
         super(manager);
     }