更新 2.8.1-2 增强 Android 10 兼容性

Author: xausky

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.github.shadowsocks.plugin.gost"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 281
-        versionName "2.8.1"
+        targetSdkVersion 29
+        versionCode 2812
+        versionName "2.8.1-2"
     }
     splits {
         abi {
@@ -19,7 +19,7 @@ android {
     }
     signingConfigs {
         releaseConfig {
-            storeFile file("../../xausky.jks")
+            storeFile file(System.getenv("HOME") + "/.android.jks")
             storePassword System.getenv("KEYSTORE_PASS")
             keyAlias System.getenv("ALIAS_NAME")
             keyPassword System.getenv("ALIAS_PASS")

app/src/main/go/build.sh

@@ -1,16 +1,16 @@
 cd $( cd "$( dirname "$0"  )" && pwd  )
-CC=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang \
+CC=$(find $ANDROID_NDK_ROOT | grep 'armv7a-linux-androideabi21-clang$') \
 GOOS="android" GOARCH="arm" CGO_ENABLED="1" \
-go build -a -o ../jniLibs/armeabi-v7a/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost
+go build -ldflags "-s -w" -a -o ../jniLibs/armeabi-v7a/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost
 
-CC=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang \
+CC=$(find $ANDROID_NDK_ROOT | grep 'aarch64-linux-android21-clang$') \
 GOOS="android" GOARCH="arm64" CGO_ENABLED="1" \
-go build -a -o ../jniLibs/arm64-v8a/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost
+go build -ldflags "-s -w" -a -o ../jniLibs/arm64-v8a/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost
 
-CC=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang \
+CC=$(find $ANDROID_NDK_ROOT | grep 'i686-linux-android21-clang$') \
 GOOS="android" GOARCH="386" CGO_ENABLED="1" \
-go build -a -o ../jniLibs/x86/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost
+go build -ldflags "-s -w" -a -o ../jniLibs/x86/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost
 
-CC=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang \
+CC=$(find $ANDROID_NDK_ROOT | grep 'x86_64-linux-android21-clang$') \
 GOOS="android" GOARCH="amd64" CGO_ENABLED="1" \
-go build -a -o ../jniLibs/x86_64/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost
+go build -ldflags "-s -w" -a -o ../jniLibs/x86_64/libgost-plugin.so github.com/ginuerzh/gost/cmd/gost