update sdk plugin

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "jni/shadowsocks"]
-	path = jni/shadowsocks
-	url = https://github.com/madeye/shadowsocks-libev.git

build-ndk.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-function try () {
-    "$@" || exit -1
-}
-
-# Build
-try $ANDROID_NDK_HOME/ndk-build clean
-try $ANDROID_NDK_HOME/ndk-build
-
-# copy executables
-rm -rf src/main/assets/armeabi-v7a
-rm -rf src/main/assets/x86
-mkdir -p src/main/assets/armeabi-v7a
-mkdir -p src/main/assets/x86
-for app in pdnsd redsocks iptables
-do
-    try mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
-    try mv libs/x86/$app src/main/assets/x86/
-done
-
-# copy libraries
-rm -rf src/main/jni/armeabi-v7a
-rm -rf src/main/jni/x86
-mkdir -p src/main/jni/armeabi-v7a
-mkdir -p src/main/jni/x86
-try mv libs/armeabi-v7a/*.so src/main/jni/armeabi-v7a/
-try mv libs/x86/*.so src/main/jni/x86/

project/plugins.sbt

@@ -1,5 +1,5 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.2.20")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.10")
 
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")

src/main/java/com/github/shadowsocks/Core.java

@@ -44,10 +44,12 @@ public class Core {
     java.lang.System.loadLibrary("ss-tunnel-jni");
     java.lang.System.loadLibrary("tun2socks-jni");
     java.lang.System.loadLibrary("pdnsd-jni");
+    java.lang.System.loadLibrary("redsocks-jni");
   }
 
   public static native void sslocal(String[] cmd);
   public static native void sstunnel(String[] cmd);
   public static native void tun2socks(String[] cmd);
   public static native void pdnsd(String[] cmd);
+  public static native void redsocks(String[] cmd);
 }

src/main/jni/Android.mk

@@ -120,27 +120,13 @@ REDSOCKS_SOURCES := base.c dnstc.c http-connect.c \
 
 LOCAL_STATIC_LIBRARIES := libevent
 
-LOCAL_MODULE := redsocks
-LOCAL_SRC_FILES := $(addprefix redsocks/, $(REDSOCKS_SOURCES))
+LOCAL_MODULE := redsocks-jni
+LOCAL_SRC_FILES := $(addprefix redsocks/, $(REDSOCKS_SOURCES)) main-jni.cpp
 LOCAL_CFLAGS := -O2 -std=gnu99 -g -I$(LOCAL_PATH)/redsocks \
 	-I$(LOCAL_PATH)/libevent/include \
 	-I$(LOCAL_PATH)/libevent
 
-include $(BUILD_EXECUTABLE)
-
-########################################################
-## pdnsd
-########################################################
-
-include $(CLEAR_VARS)
-
-PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/src/*.c)
-
-LOCAL_MODULE    := pdnsd
-LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
-LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
-
-include $(BUILD_EXECUTABLE)
+include $(BUILD_SHARED_LIBRARY)
 
 ########################################################
 ## pdnsd library
@@ -183,23 +169,6 @@ include $(BUILD_SHARED_LIBRARY)
 ## shadowsocks tunnel
 ########################################################
 
-# include $(CLEAR_VARS)
-#
-# SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
-#
-# LOCAL_MODULE    := ss-tunnel
-# LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
-# LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
-# 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
-# 					-I$(LOCAL_PATH)/libev/ \
-# 					-I$(LOCAL_PATH)/openssl/include 
-#
-# LOCAL_STATIC_LIBRARIES := libev libcrypto
-#
-# LOCAL_LDLIBS := -llog
-#
-# include $(BUILD_EXECUTABLE)
-
 ########################################################
 ## shadowsocks tunnel library
 ########################################################