合并声网代码

main/build.gradle

@@ -30,7 +30,7 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
         }
 
         javaCompileOptions {
@@ -72,7 +72,7 @@ dependencies {
     //短视频
     api project(':video')
     api project(':common')
-    api project(':FaceUnity')//新娱美颜
+    api project(':lib_faceunity')//新娱美颜
     api project(':Share')//分享
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'
@@ -81,7 +81,6 @@ dependencies {
     implementation project(path: ':lib_country_code')
     //抽屉菜单
     implementation 'com.justkiddingbaby:slidemenu:1.3.0'
-    implementation 'com.xj.marqueeView:marqueeView:0.1.20'
     //引导层
     implementation 'com.binioter:guideview:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'