diff --git a/app/build.gradle b/app/build.gradle index 53594ea272..2aaeb5eaae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi", "armeabi-v7a" } } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8af53f731e..30f6390485 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -304,7 +304,8 @@ #-----ZhiDaoService----- -keep class com.zhidao.auto.platform.*{*;} -keep class com.zhidaohulian.*{*;} --keep class com.elegant.analytics.*{*;} +-keep class com.zhidao.boot.*{*;} +-keep class com.elegant.*{*;} -keep class com.zhidao.socketsdk.*{*;} -keep class com.zhidao.ptech.*{*;} -keep class com.zhidao.autopilot.support.*{*;} diff --git a/gradle.properties b/gradle.properties index 69d77bb862..d46ad32e32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m +#org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx4096m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -17,6 +18,7 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true +org.gradle.parallel=true ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ diff --git a/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.png b/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.png index 172a7f7486..c58571da17 100644 Binary files a/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.png and b/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.png differ diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle index 3b68184f18..a1f2ea917c 100644 --- a/modules/mogo-module-v2x/build.gradle +++ b/modules/mogo-module-v2x/build.gradle @@ -27,7 +27,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-v2x/consumer-rules.pro b/modules/mogo-module-v2x/consumer-rules.pro index 4a277db73d..009c7561da 100644 --- a/modules/mogo-module-v2x/consumer-rules.pro +++ b/modules/mogo-module-v2x/consumer-rules.pro @@ -1,2 +1,3 @@ --keep class com.tencent.** { *; } --keep com.mogo.module.v2x.entity.** { *; } \ No newline at end of file +#-----V2XModule----- +-keep class com.tencent.* { *; } +-keep class com.mogo.module.v2x.entity.* { *; } \ No newline at end of file diff --git a/modules/mogo-module-v2x/proguard-rules.pro b/modules/mogo-module-v2x/proguard-rules.pro index 355c19a070..ec6d67332b 100644 --- a/modules/mogo-module-v2x/proguard-rules.pro +++ b/modules/mogo-module-v2x/proguard-rules.pro @@ -19,5 +19,7 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----V2XModule----- -keep class com.tencent.* { *; } -keep class com.mogo.module.v2x.entity.* { *; } \ No newline at end of file