From e8ea70bc637d0eb6d8083c406d2dcac7645ed69c Mon Sep 17 00:00:00 2001 From: pengfengwang <550616352@qq.com> Date: Sun, 6 May 2018 15:17:19 +0800 Subject: [PATCH] =?UTF-8?q?[bugfix]=20isForceInsert=E4=B8=BAfalse=E6=97=B6?= =?UTF-8?q?=EF=BC=8Ctask=E7=9A=84=E5=90=8D=E5=AD=97=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=98=AF=E7=BC=A9=E5=86=99=E5=BF=85=E9=A1=BB=E6=98=AF=E5=85=A8?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 例如: assembleDebug不能是任何形式的缩写输入 --- .../gradle/plugin/RobustApkHashAction.groovy | 4 ++ .../gradle/plugin/RobustTransform.groovy | 66 ++++++++++++------- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustApkHashAction.groovy b/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustApkHashAction.groovy index 32fa366e..71b3816f 100755 --- a/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustApkHashAction.groovy +++ b/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustApkHashAction.groovy @@ -19,6 +19,10 @@ class RobustApkHashAction implements Action { return } + if (!RobustTransform.isInsertCode(variant.buildType.name)) { + return + } + packageTask.doFirst { // project.logger.quiet("===start compute robust apk hash===") // def startTime = System.currentTimeMillis() diff --git a/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustTransform.groovy b/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustTransform.groovy index 2bd7505c..248b3e5d 100644 --- a/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustTransform.groovy +++ b/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustTransform.groovy @@ -2,15 +2,22 @@ package robust.gradle.plugin import com.android.build.api.transform.* import com.android.build.gradle.internal.pipeline.TransformManager +import com.android.build.gradle.internal.pipeline.TransformTask import com.meituan.robust.Constants import javassist.ClassPool +import org.apache.commons.io.FileUtils import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.api.execution.TaskExecutionListener import org.gradle.api.logging.Logger +import org.gradle.api.tasks.TaskState +import org.gradle.internal.hash.HashUtil import robust.gradle.plugin.asm.AsmInsertImpl import robust.gradle.plugin.javaassist.JavaAssistInsertImpl import java.util.zip.GZIPOutputStream + /** * Created by mivanzhang on 16/11/3. * @@ -29,6 +36,7 @@ class RobustTransform extends Transform implements Plugin { private static boolean isExceptMethodLevel = false; // private static boolean isForceInsert = true; private static boolean isForceInsert = false; + private static boolean insertCode = false; // private static boolean useASM = false; private static boolean useASM = true; def robust @@ -40,33 +48,23 @@ class RobustTransform extends Transform implements Plugin { robust = new XmlSlurper().parse(new File("${project.projectDir}/${Constants.ROBUST_XML}")) logger = project.logger initConfig() - //isForceInsert 是true的话，则强制执行插入 - if (!isForceInsert) { - def taskNames = project.gradle.startParameter.taskNames - def isDebugTask = false; - for (int index = 0; index < taskNames.size(); ++index) { - def taskName = taskNames[index] - logger.debug "input start parameter task is ${taskName}" - //FIXME: assembleRelease下屏蔽Prepare，这里因为还没有执行Task，没法直接通过当前的BuildType来判断，所以直接分析当前的startParameter中的taskname， - //另外这里有一个小坑task的名字不能是缩写必须是全称 例如assembleDebug不能是任何形式的缩写输入 - if (taskName.endsWith("Debug") && taskName.contains("Debug")) { -// logger.warn " Don't register robust transform for debug model !!! task is：${taskName}" - isDebugTask = true - break; + project.android.registerTransform(this) + project.afterEvaluate(new RobustApkHashAction()) + project.gradle.addListener(new TaskExecutionListener() { + @Override + void beforeExecute(Task task) { + if (task instanceof TransformTask) { + if (task.transform instanceof RobustTransform) { + insertCode = isInsertCode(task.variantName) + } } } - if (!isDebugTask) { - project.android.registerTransform(this) - project.afterEvaluate(new RobustApkHashAction()) - logger.quiet "Register robust transform successful !!!" - } - if (null != robust.switch.turnOnRobust && !"true".equals(String.valueOf(robust.switch.turnOnRobust))) { - return; + + @Override + void afterExecute(Task task, TaskState taskState) { + } - } else { - project.android.registerTransform(this) - project.afterEvaluate(new RobustApkHashAction()) - } + }) } def initConfig() { @@ -135,6 +133,22 @@ class RobustTransform extends Transform implements Plugin { @Override void transform(Context context, Collection inputs, Collection referencedInputs, TransformOutputProvider outputProvider, boolean isIncremental) throws IOException, TransformException, InterruptedException { + logger.quiet "'================robust insertCode: $insertCode================" + if (!insertCode) { + inputs.each { + it.directoryInputs.each { + def dest = outputProvider.getContentLocation(it.name, it.contentTypes, it.scopes, Format.DIRECTORY) + FileUtils.copyDirectory(it.file, dest) + } + + it.jarInputs.each { + String name = HashUtil.createHash(it.file.absolutePath, "MD5").asHexString() + def dest = outputProvider.getContentLocation(name, it.contentTypes, it.scopes, Format.JAR) + FileUtils.copyFile(it.file, dest) + } + } + return + } logger.quiet '================robust start================' def startTime = System.currentTimeMillis() outputProvider.deleteAll() @@ -196,4 +210,8 @@ class RobustTransform extends Transform implements Plugin { } + static boolean isInsertCode(String buildType) { + //isForceInsert 是true的话，则强制执行插入 + return isForceInsert || !"debug".equalsIgnoreCase(buildType) + } } \ No newline at end of file