diff --git a/build-ndk.sh b/build-ndk.sh index 79427e1d..1031190d 100755 --- a/build-ndk.sh +++ b/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 diff --git a/jni/Application.mk.16 b/jni/Application.mk similarity index 68% rename from jni/Application.mk.16 rename to jni/Application.mk index 73844094..402fbfe3 100644 --- a/jni/Application.mk.16 +++ b/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 diff --git a/jni/Application.mk.9 b/jni/Application.mk.9 deleted file mode 100644 index 0b566af1..00000000 --- a/jni/Application.mk.9 +++ /dev/null @@ -1,4 +0,0 @@ -APP_ABI := armeabi armeabi-v7a x86 -APP_PLATFORM := android-9 -APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.8 diff --git a/jni/shadowsocks b/jni/shadowsocks index d37f8d30..06f1a57c 160000 --- a/jni/shadowsocks +++ b/jni/shadowsocks @@ -1 +1 @@ -Subproject commit d37f8d302532a8d442233d9b752324ffff99bbd0 +Subproject commit 06f1a57c9bd5a4ff96966a616ab3f1ec330f4c4c diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 9a11b6f3..ad6fd36f 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ android:required="false"/> = 16) { - copyAssets("api-16/" + System.getABI) - } else { - copyAssets(System.getABI) - } + copyAssets(System.getABI) if (Build.VERSION.SDK_INT >= 20) { copyToSystem()