test

python/help.py

@@ -23,9 +23,9 @@ config.update(properties)
 print(" ")
 print("------------- 使用帮助（混淆完一定要全流程测试） -----------------")
 print("0、一条龙混淆")
-print("1、activity类名混淆（只支持java）")
+print("1、activity类名混淆（支持kotlin，没测试过）")
 print("2、api混淆（针对 Retrofit 注解）")
-print("3、manifest混淆 在包路径中随机插入Activity并注册 （支持kotlin 但是kotlin的源码必须在src/main/java下）")
+print("3、manifest混淆 在包路径中随机插入Activity并注册")
 print("4、包路径混淆（支持kotlin 但是kotlin的源码必须在src/main/java下）")
 print("5、字符串插入/加密")
 print("6、图片混淆（修改md5 & 创建随机图片，体积会增加1-2M）")

python/tools/garble/manifest_grable.py

@@ -22,6 +22,9 @@ class ManifestGarble:
                     act_name = self.__gen_rand_str()
                     act_path = "%s/%s.java"%(root, act_name) 
                     pkg_name = root.split("main/java/")[1].replace("/",".")
+                    if "main/kotlin/" in root:
+                        pkg_name = root.split("main/kotlin/")[1].replace("/",".")
+
                     act_content = ClassBuilder().new_class(act_name,pkg_name)
                     with open(act_path, "w+", encoding="utf-8") as fout:
                         fout.write(act_content)
@@ -46,7 +49,7 @@ class ManifestGarble:
     def manifest_garble(self, config):
         for main_dir in config['lib_main']:
             print("activity generating  ...")
-            activities = self.__create_activities("%s/%s/java"%(config["root"], main_dir))
+            activities = self.__create_activities("%s/%s"%(config["root"], main_dir))
             print("inster activity to manifest ...")
             self.__insert_to_manifest("%s/%s/AndroidManifest.xml"% (config["root"], main_dir), activities)
         

python/tools/garble/package_garble.py

@@ -41,6 +41,9 @@ class PackageGarble:
         for root, dirs, files in os.walk(path):
             if len(dirs) == 0:
                 mp_path = root.split("main/java/")[1].replace("/", ".")
+                if "main/kotlin" in root:
+                    mp_path = root.split("main/kotlin/")[1].replace("/", ".")
+                    
                 if mp_path not in self.pkg_mapping.keys():
                     random_str = ""
                     # 按长度排序
@@ -114,7 +117,7 @@ class PackageGarble:
         print("find pkgs...")
         #生成混淆字典
         for main_dir in config['lib_main']:
-            self.__find_pkgs("%s/%s/java" % (config['root'], main_dir))
+            self.__find_pkgs("%s/%s" % (config['root'], main_dir))
         
         # keys = sorted(self.pkg_mapping.keys(),
         #               key=lambda i: len(i.split(".")), reverse=True)
@@ -123,7 +126,7 @@ class PackageGarble:
 
         #重命名路径
         for main_dir in config['lib_main']:
-            self.__rename_pkg("%s/%s/java" % (config['root'], main_dir))
+            self.__rename_pkg("%s/%s" % (config['root'], main_dir))
 
         
         for (key,value) in self.pkg_mapping.items():