fix #116

build-ndk.sh

@@ -1,38 +1,14 @@
 #!/bin/bash
 
-# Target 9
-cp jni/Application.mk.9 jni/Application.mk
 ndk-build clean
 ndk-build
-rm -rf src/main/assets/armeabi
 rm -rf src/main/assets/armeabi-v7a
 rm -rf src/main/assets/x86
-mkdir -p src/main/assets/armeabi
 mkdir -p src/main/assets/armeabi-v7a
 mkdir -p src/main/assets/x86
 for app in pdnsd redsocks
 do
-    mv libs/armeabi/$app src/main/assets/armeabi/
     mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
     mv libs/x86/$app src/main/assets/x86/
 done
-rm -rf src/main/jni
-mv libs src/main/jni
-
-# Target 16
-cp jni/Application.mk.16 jni/Application.mk
-ndk-build clean
-ndk-build
-rm -rf src/main/assets/api-16/armeabi
-rm -rf src/main/assets/api-16/armeabi-v7a
-rm -rf src/main/assets/api-16/x86
-mkdir -p src/main/assets/api-16/armeabi
-mkdir -p src/main/assets/api-16/armeabi-v7a
-mkdir -p src/main/assets/api-16/x86
-for app in pdnsd redsocks
-do
-    mv libs/armeabi/$app src/main/assets/api-16/armeabi/
-    mv libs/armeabi-v7a/$app src/main/assets/api-16/armeabi-v7a/
-    mv libs/x86/$app src/main/assets/api-16/x86/
-done
 

jni/Application.mk

@@ -1,4 +1,4 @@
-APP_ABI      			:= armeabi armeabi-v7a x86
+APP_ABI      			:= armeabi-v7a x86
 APP_PLATFORM 			:= android-16
 APP_STL      			:= stlport_static
 NDK_TOOLCHAIN_VERSION 	:= 4.8

jni/Application.mk.9

@@ -1,4 +0,0 @@
-APP_ABI      			:= armeabi armeabi-v7a x86
-APP_PLATFORM 			:= android-9
-APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= 4.8

src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
       android:required="false"/>
 
   <uses-sdk
-      android:minSdkVersion="14"
+      android:minSdkVersion="16"
       android:targetSdkVersion="19"/>
 
   <application

src/main/scala/com/github/shadowsocks/Shadowsocks.scala

@@ -825,11 +825,7 @@ class Shadowsocks
 
     crash_recovery()
 
-    if (Build.VERSION.SDK_INT >= 16) {
-      copyAssets("api-16/" + System.getABI)
-    } else {
-      copyAssets(System.getABI)
-    }
+    copyAssets(System.getABI)
 
     if (Build.VERSION.SDK_INT >= 20) {
       copyToSystem()