Commit 97c6ff95 authored by Max Lv's avatar Max Lv

fix an issue in the build scripts

parent 971ef221
#!/bin/bash #!/bin/bash
ndk-build clean function try () {
ndk-build "$@" || exit -1
}
# Build
try ndk-build clean
try ndk-build
# copy executables
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-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-v7a/$app src/main/assets/armeabi-v7a/ try mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
mv libs/x86/$app src/main/assets/x86/ try mv libs/x86/$app src/main/assets/x86/
done 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/
...@@ -21,11 +21,11 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) { ...@@ -21,11 +21,11 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) {
} else if (family == ANDROID_CPU_FAMILY_MIPS) { } else if (family == ANDROID_CPU_FAMILY_MIPS) {
abi = "mips"; abi = "mips";
} else if (family == ANDROID_CPU_FAMILY_ARM) { } else if (family == ANDROID_CPU_FAMILY_ARM) {
if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) { // if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) {
abi = "armeabi-v7a"; abi = "armeabi-v7a";
} else { // } else {
abi = "armeabi"; // abi = "armeabi";
} // }
} }
return env->NewStringUTF(abi); return env->NewStringUTF(abi);
} }
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks" package="com.github.shadowsocks"
android:versionCode="71" android:versionCode="72"
android:versionName="2.2.3"> android:versionName="2.2.4">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
......
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