Commit c05a63a7 authored by Max Lv's avatar Max Lv

fix #116

parent 6074a99e
#!/bin/bash #!/bin/bash
# Target 9
cp jni/Application.mk.9 jni/Application.mk
ndk-build clean ndk-build clean
ndk-build ndk-build
rm -rf src/main/assets/armeabi
rm -rf src/main/assets/armeabi-v7a rm -rf src/main/assets/armeabi-v7a
rm -rf src/main/assets/x86 rm -rf src/main/assets/x86
mkdir -p src/main/assets/armeabi
mkdir -p src/main/assets/armeabi-v7a mkdir -p src/main/assets/armeabi-v7a
mkdir -p src/main/assets/x86 mkdir -p src/main/assets/x86
for app in pdnsd redsocks for app in pdnsd redsocks
do do
mv libs/armeabi/$app src/main/assets/armeabi/
mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/ mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
mv libs/x86/$app src/main/assets/x86/ mv libs/x86/$app src/main/assets/x86/
done 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
APP_ABI := armeabi armeabi-v7a x86 APP_ABI := armeabi-v7a x86
APP_PLATFORM := android-16 APP_PLATFORM := android-16
APP_STL := stlport_static APP_STL := stlport_static
NDK_TOOLCHAIN_VERSION := 4.8 NDK_TOOLCHAIN_VERSION := 4.8
APP_ABI := armeabi armeabi-v7a x86
APP_PLATFORM := android-9
APP_STL := stlport_static
NDK_TOOLCHAIN_VERSION := 4.8
Subproject commit d37f8d302532a8d442233d9b752324ffff99bbd0 Subproject commit 06f1a57c9bd5a4ff96966a616ab3f1ec330f4c4c
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
android:required="false"/> android:required="false"/>
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="16"
android:targetSdkVersion="19"/> android:targetSdkVersion="19"/>
<application <application
......
...@@ -825,11 +825,7 @@ class Shadowsocks ...@@ -825,11 +825,7 @@ class Shadowsocks
crash_recovery() crash_recovery()
if (Build.VERSION.SDK_INT >= 16) { copyAssets(System.getABI)
copyAssets("api-16/" + System.getABI)
} else {
copyAssets(System.getABI)
}
if (Build.VERSION.SDK_INT >= 20) { if (Build.VERSION.SDK_INT >= 20) {
copyToSystem() copyToSystem()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment