From 75953d3387abb8ddb419d00837b9e898296644bc Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 24 Nov 2023 19:39:49 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0][=E6=8A=80=E6=9C=AF=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=20release=E7=89=88=E6=9C=AC=E5=8D=A1=E9=A1=BF=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=85=B3=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 29 ++++++++++++++----- .../jank/compiler/JankPointAutoGenerator.java | 2 -- .../lancet/jank/spi/HandlerHookerImpl.kt | 0 .../lancet/jank/spi/HookInvokerImpl.java | 0 .../launcher/lancet/jank/ui/UiPostLancet.kt | 0 gradle/bytex/bytex_handler_proxy.gradle | 4 +-- gradle/bytex/bytex_lancetx.gradle | 4 +-- 7 files changed, 26 insertions(+), 13 deletions(-) rename app/src/{main => debug}/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java (99%) rename app/src/{main => debug}/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt (100%) rename app/src/{main => debug}/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java (100%) rename app/src/{main => debug}/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt (100%) diff --git a/app/build.gradle b/app/build.gradle index ae17181e1d..608f707c2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,16 @@ android { multiDexEnabled true } + sourceSets { + main { + if (!rootProject.isReleaseBuild()) { + java.srcDirs = ['src/main/java', 'src/debug/java'] + } else { + java.srcDirs = ['src/main/java'] + } + } + } + packagingOptions { exclude 'META-INF/proguard/coroutines.pro' exclude 'META-INF/*' @@ -213,15 +223,20 @@ dependencies { // releaseImplementation rootProject.ext.dependencies.releaseleakcanary implementation rootProject.ext.dependencies.android_start_up implementation rootProject.ext.dependencies.lancetx_runtime - implementation rootProject.ext.dependencies.lancetx_compiler_lib - implementation rootProject.ext.dependencies.handler_proxy_runtime - kapt rootProject.ext.dependencies.lancetx_compiler - annotationProcessor rootProject.ext.dependencies.lancetx_compiler - annotationProcessor rootProject.ext.dependencies.google_auto_service - kapt rootProject.ext.dependencies.google_auto_service - compileOnly rootProject.ext.dependencies.google_auto_service + if (!rootProject.isReleaseBuild()) { + implementation rootProject.ext.dependencies.lancetx_compiler_lib + implementation rootProject.ext.dependencies.handler_proxy_runtime + + kapt rootProject.ext.dependencies.lancetx_compiler + annotationProcessor rootProject.ext.dependencies.lancetx_compiler + + annotationProcessor rootProject.ext.dependencies.google_auto_service + kapt rootProject.ext.dependencies.google_auto_service + + compileOnly rootProject.ext.dependencies.google_auto_service + } // implementation rootProject.ext.dependencies.mogocustommap implementation project(':libraries:mapmodule') diff --git a/app/src/main/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java b/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java similarity index 99% rename from app/src/main/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java rename to app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java index 14031942fa..a95ffe309a 100644 --- a/app/src/main/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java +++ b/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java @@ -8,7 +8,6 @@ import android.app.Service; import android.content.BroadcastReceiver; import android.content.ContentProvider; import android.content.pm.PackageManager; -import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; import android.os.SystemClock; @@ -24,7 +23,6 @@ import com.mogo.core.lancetx.compiler.lib.generator.Type; import java.io.File; import java.io.InputStream; -import java.nio.channels.FileChannel; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.LockSupport; diff --git a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt similarity index 100% rename from app/src/main/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt rename to app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt diff --git a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java similarity index 100% rename from app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java rename to app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java diff --git a/app/src/main/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt b/app/src/debug/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt similarity index 100% rename from app/src/main/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt rename to app/src/debug/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt diff --git a/gradle/bytex/bytex_handler_proxy.gradle b/gradle/bytex/bytex_handler_proxy.gradle index 92326cd4c2..d39dc3b0b9 100644 --- a/gradle/bytex/bytex_handler_proxy.gradle +++ b/gradle/bytex/bytex_handler_proxy.gradle @@ -1,6 +1,6 @@ apply plugin: 'bytex.handler_proxy' handler_proxy { - enable true - enableInDebug true + enable !rootProject.isReleaseBuild() + enableInDebug !rootProject.isReleaseBuild() } diff --git a/gradle/bytex/bytex_lancetx.gradle b/gradle/bytex/bytex_lancetx.gradle index 8512a00458..7f1ff9efe7 100644 --- a/gradle/bytex/bytex_lancetx.gradle +++ b/gradle/bytex/bytex_lancetx.gradle @@ -8,7 +8,7 @@ LancetX { "com.zhjt.mogo_core_function_devatools.perf" ] synchronizedLock { - enabled true + enabled !rootProject.isReleaseBuild() blackList = [ "okio.AsyncTimeout\$Watchdog" ] @@ -28,7 +28,7 @@ LancetX { enable true } main_block_check { - enable true + enable !rootProject.isReleaseBuild() } } }