合并6.8.0代码

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.alibaba.arouter'
 apply from: "../package_config.gradle"
+
 android {
     namespace "com.pandoralive.shayu"
     /*  applicationVariants.all { variant ->
@@ -215,9 +216,9 @@ android {
             def server = ''
             if (variant.name.startsWith('huawei')) {
                 channel = "华为"
-            } else if (variant.name.startsWith('samsung')) {
+            } else if (variant.name.contains('samsung')) {
                 channel = "三星"
-            } else if (variant.name.startsWith('google')) {
+            } else if (variant.name.contains('google')) {
                 channel = "谷歌"
             } else {
                 channel = "链接"
@@ -311,11 +312,13 @@ android {
             String tskReqStr = gradle.getStartParameter().getTaskRequests().args.toString()
             println("处理ndk 版本 = " + tskReqStr)
             def isLink = tskReqStr.contains("Link")
-            if (isLink) {
+            if (isLink) {//移除32位so库可以有效降低包体大小，等需要时再弄
                 abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+                //abiFilters "arm64-v8a", "x86_64"
                 println("打包ndk 链接")
             } else {
                 abiFilters "armeabi-v7a", "arm64-v8a"
+                //abiFilters "arm64-v8a"
                 println("打包ndk其他")
             }