Merge branch 'devs/custom_diff_rebase' into dev

Author: Nalecy

tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/extension/TinkerPatchExtension.groovy

@@ -102,6 +102,12 @@ public class TinkerPatchExtension {
      */
     String customPath
 
+    /**
+     * customDiffPathArgs
+     * default: null
+     */
+    String customDiffPathArgs
+
     public TinkerPatchExtension() {
         oldApk = ""
         outputFolder = ""
@@ -112,6 +118,7 @@ public class TinkerPatchExtension {
         useSign = true
         tinkerEnable = true
         customPath = null
+        customDiffPathArgs = null
     }
 
     void checkParameter() {

tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/task/TinkerPatchSchemaTask.groovy

@@ -138,6 +138,7 @@ public class TinkerPatchSchemaTask extends DefaultTask {
                     .setIgnoreWarning(configuration.ignoreWarning)
                     .setAllowLoaderInAnyDex(configuration.allowLoaderInAnyDex)
                     .setCustomDiffPath(configuration.customPath)
+                    .setCustomDiffPathArgs(configuration.customDiffPathArgs)
                     .setRemoveLoaderForAllDex(configuration.removeLoaderForAllDex)
                     .setDexFilePattern(new ArrayList<String>(configuration.dex.pattern))
                     .setIsProtectedApp(configuration.buildConfig.isProtectedApp)

tinker-build/tinker-patch-lib/src/main/java/com/tencent/tinker/build/patch/Configuration.java

@@ -268,6 +268,7 @@ public Configuration(InputParam param) throws IOException, TinkerPatchException
 
         mUseSignAPk = param.useSign;
         mCustomDiffPath = param.customDiffPath;
+        mCustomDiffPathArgs = param.customDiffPathArgs;
         setSignData(param.signFile, param.keypass, param.storealias, param.storepass);
 
         FileOperation.cleanDir(new File(mOutFolder));

tinker-build/tinker-patch-lib/src/main/java/com/tencent/tinker/build/patch/InputParam.java

@@ -35,6 +35,7 @@ public class InputParam {
     public final String  storealias;
     public final String  storepass;
     public final String customDiffPath;
+    public final String customDiffPathArgs;
     public final boolean ignoreWarning;
     public final boolean allowLoaderInAnyDex;
     public final boolean removeLoaderForAllDex;
@@ -98,6 +99,7 @@ private InputParam(
             String storealias,
             String storepass,
             String customDiffPath,
+            String customDiffPathArgs,
             boolean ignoreWarning,
             boolean allowLoaderInAnyDex,
             boolean removeLoaderForAllDex,
@@ -130,6 +132,7 @@ private InputParam(
         this.storealias = storealias;
         this.storepass = storepass;
         this.customDiffPath = customDiffPath;
+        this.customDiffPathArgs = customDiffPathArgs;
         this.ignoreWarning = ignoreWarning;
         this.allowLoaderInAnyDex = allowLoaderInAnyDex;
         this.removeLoaderForAllDex = removeLoaderForAllDex;
@@ -168,6 +171,7 @@ public static class Builder {
         private String  storealias;
         private String  storepass;
         private String  customDiffPath;
+        private String  customDiffPathArgs;
         private boolean ignoreWarning;
         private boolean allowLoaderInAnyDex;
         private boolean removeLoaderForAllDex;
@@ -311,6 +315,11 @@ public Builder setCustomDiffPath(String path) {
             return this;
         }
 
+        public Builder setCustomDiffPathArgs(String args) {
+            this.customDiffPathArgs = args;
+            return this;
+        }
+
         public Builder setRemoveLoaderForAllDex(boolean removeLoaderForAllDex){
             this.removeLoaderForAllDex = removeLoaderForAllDex;
             return this;
@@ -376,6 +385,7 @@ public InputParam create() {
                     storealias,
                     storepass,
                     customDiffPath,
+                    customDiffPathArgs,
                     ignoreWarning,
                     allowLoaderInAnyDex,
                     removeLoaderForAllDex,

tinker-build/tinker-patch-lib/src/main/java/com/tencent/tinker/build/util/CustomDiff.java

@@ -15,7 +15,7 @@
 public class CustomDiff {
 
     public static boolean checkHasCustomDiff(Configuration config) {
-        return config.mCustomDiffPath != null && !config.mCustomDiffPath.trim().isEmpty();
+        return config.mCustomDiffPath != null && !config.mCustomDiffPath.trim().isEmpty() && config.mCustomDiffPathArgs != null && !config.mCustomDiffPathArgs.isEmpty();
     }
 
     public static void diffFile(String mCustomDiffPath,String mCustomDiffPathArgs, File oldFile, File newFile, File diffFile) throws IOException {